Merge pull request #962 from tayaphidoux/patch-2

re implimentation of #940
OpenCollarTeam · Jul 11, 2023 · 05d9704 · 05d9704
2 parents 8f4ad07 + 5b4362c
commit 05d9704
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/Apps/oc_outfits.lsl b/src/Apps/oc_outfits.lsl
@@ -18,6 +18,9 @@ Lillith (Lillith Xue)
 Phidoux (Taya Maruti)
     *Sept 2022      - Limited core lock/unlock to wearer and owner (issue #855)
 et al.
+    *Mar 2023       - Fixed lock issues with "~" and some navigation errors. (issue #910)
+    *June 2023      - Fixed Lock issue kAv instead of kID on the button check.
+    *June 20 2023   - Fixed Stray ~ that was causing detach to not work.
 
 
 Licensed under the GPLv2. See LICENSE for full details.
@@ -27,7 +30,7 @@ https://github.com/OpenCollarTeam/OpenCollar
 
 string g_sParentMenu = "Apps";
 string g_sSubMenu = "Outfits";
-string g_sAppVersion = "1.6";
+string g_sAppVersion = "1.7";
 //string g_sScriptVersion = "8.0";
 
 
@@ -239,6 +242,7 @@ UserCommand(integer iNum, string sStr, key kID) {
                 g_sPath=GetFolderName(FALSE)+"/"+sChangevalue;
                 g_iListenTimeout=0;
             }
+            llOwnerSay("[command "+sChangetype+"]"+g_sPath);
 
             if(!g_iLocked){
                 llOwnerSay("@detach=n");
@@ -247,6 +251,7 @@ UserCommand(integer iNum, string sStr, key kID) {
             ForceLockCore();
             TickBrowser();
             llSetTimerEvent(1);
+            llOwnerSay("[command "+sChangetype+"] Attempt detach");
             if(!Bool((g_iAccessBitSet&32))){
                 if(llSubStringIndex(g_sPath, GetFolderName(TRUE))==-1)
                     llOwnerSay("@detachall:"+GetFolderName(FALSE)+"=force");
@@ -257,15 +262,25 @@ UserCommand(integer iNum, string sStr, key kID) {
             }
             llSleep(2); // incase of lag
             string sAppend;
-            if(g_iRLVa)sAppend=RLVA_APPEND;
+            if(g_iRLVa)
+            {
+                sAppend=RLVA_APPEND;
+            }
+            else
+            {
+                sAppend=RLV_APPEND;
+            }
             if (g_sPath == GetOutfitSystem(FALSE)+"/" || g_sPath == GetOutfitSystem(FALSE)+"/"+sAppend) g_sLastOutfit = "NONE";
             else g_sLastOutfit=g_sPath;
 
+            if(!g_iLocked){
+                llOwnerSay("@detach=y");
+            }
             RmCorelock();
             llSleep(1);
         }
         if(sChangetype == "wear"){ //This looks like dead code TODO: Verify for removal?
-            if (g_sPath != "" && g_sPath != ".") llOwnerSay("@attachallover:"+g_sPath+"=force");
+            if (g_sPath != "~" && g_sPath != ".") llOwnerSay("@attachallover:"+g_sPath+"=force");
         }
     }
 }
@@ -307,11 +322,14 @@ ForceLockCore(){
     llOwnerSay("@detachallthis:"+GetOutfitSystem(TRUE)+"=y");
     llSleep(1);
     llOwnerSay("@detachallthis:"+GetOutfitSystem(TRUE)+"=n");
-    llSleep(0.5);
+    llSleep(1); // origionaly 0.5 may be to short and causes ~.core to be open during detach process.
 }
 
 RmCorelock(){
-    llOwnerSay("@detachallthis:"+GetOutfitSystem(TRUE)+"=y");
+    if(!g_iLockCore)
+    {
+        llOwnerSay("@detachallthis:"+GetOutfitSystem(TRUE)+"=y");
+    }
 }
 
 integer ALIVE = -55;
@@ -321,6 +339,7 @@ integer STARTUP = -57;
 integer g_iRLVa = FALSE;
 
 string RLVA_APPEND=".";
+string RLV_APPEND="~";
 
 string GetOutfitSystem(integer iCorePath){
     if(g_iRLVa){
@@ -417,11 +436,10 @@ state active
                     if(sMsg == UPMENU) {
                         iRespring=FALSE;
                         llMessageLinked(LINK_SET, iAuth, "menu "+g_sParentMenu, kAv);
-                    }
-                    else if(sMsg == TickBox(g_iLockCore, "Lock Core")){
-                        if(iAuth != CMD_OWNER && kID != g_kWearer) {
-                           llMessageLinked(LINK_SET,NOTIFY, "0%NOACCESS% to core", kID);
-                           return;
+                    }else if(sMsg == TickBox(g_iLockCore, "Lock Core")){
+                        if(iAuth != CMD_OWNER && kAv != g_kWearer) {
+                            llMessageLinked(LINK_SET,NOTIFY, "0%NOACCESS% to core", kID);
+                            return;
                         }
                         g_iLockCore=1-g_iLockCore;
                         llSetTimerEvent(120);