Merge pull request #309 from zontreck/v74

v7.4
OpenCollarTeam · Apr 10, 2020 · 4604a44 · 4604a44
2 parents b8f81e2 + c5c6f4a
commit 4604a44
Show file tree

Hide file tree

Showing 55 changed files with 508 additions and 7,870 deletions.
diff --git a/src/collar/oc_anim.lsl b/src/collar/oc_anim.lsl
@@ -87,11 +87,6 @@ integer DIALOG_TIMEOUT = -9002;
 
 integer g_iAOChannel = -782690;
 
-integer MVANIM_INIT = 13000;
-integer MVANIM_ANNOUNCE = 13001;
-integer MVANIM_SKIP = 13002;
-integer MVANIM_GIVE = 13003;
-
 string g_sSettingToken = "anim_";
 //string g_sGlobalToken = "global_";
 key g_kWearer;
@@ -592,13 +587,14 @@ SearchIndicators(){
 
 
 }
+/*
 Indicator(integer iMode){
     if(INDICATOR_THIS==-1)return;
     if(iMode)
         llSetLinkPrimitiveParamsFast(INDICATOR_THIS,[PRIM_FULLBRIGHT,ALL_SIDES,TRUE,PRIM_BUMP_SHINY,ALL_SIDES,PRIM_SHINY_NONE,PRIM_BUMP_NONE,PRIM_GLOW,ALL_SIDES,0.4]);
     else
         llSetLinkPrimitiveParamsFast(INDICATOR_THIS,[PRIM_FULLBRIGHT,ALL_SIDES,FALSE,PRIM_BUMP_SHINY,ALL_SIDES,PRIM_SHINY_HIGH,PRIM_BUMP_NONE,PRIM_GLOW,ALL_SIDES,0.0]);
-}
+}*/
 
 
 default {
@@ -886,7 +882,7 @@ state inUpdate{
         else if(iNum == 0){
             if(sMsg == "do_move" && !g_iIsMoving){
 
-                if(llGetLinkNumber()==LINK_ROOT)return;
+                if(llGetLinkNumber()==LINK_ROOT || llGetLinkNumber() == 0)return;
 
                 list Parameters = llParseStringKeepNulls(llList2String(llGetLinkPrimitiveParams(llGetLinkNumber(), [PRIM_DESC]),0), ["~"],[]);
                 ExtractPart();

diff --git a/src/collar/oc_auth.lsl b/src/collar/oc_auth.lsl
@@ -398,12 +398,23 @@ integer Auth(string sObjID) {
         iNum = CMD_TRUSTED;
     else if (sID == g_sWearerID)
         iNum = CMD_WEARER;
-    else if (g_iOpenAccess)
-        iNum = CMD_EVERYONE;
+    else if (g_iOpenAccess){
+        if(in_range(sID))
+            iNum = CMD_EVERYONE;
+        else iNum = CMD_NOACCESS;
+    }
     else if (g_iGroupEnabled && (string)llGetObjectDetails((key)sObjID, [OBJECT_GROUP]) == (string)g_kGroup && (key)sID != g_sWearerID)  //meaning that the command came from an object set to our control group, and is not owned by the wearer
-        iNum = CMD_GROUP;
+    {
+        if(in_range(sObjID))
+            iNum = CMD_GROUP;
+        else
+            iNum = CMD_NOACCESS;
+    }
     else if (llSameGroup(sID) && g_iGroupEnabled && sID != g_sWearerID) {
-        iNum = CMD_GROUP;
+        if(in_range(sID))
+            iNum = CMD_GROUP;
+        else
+            iNum = CMD_NOACCESS;
     } else
         iNum = CMD_NOACCESS;
     //Debug("Authed as "+(string)iNum);
@@ -658,6 +669,7 @@ default {
            // Debug("profiling restarted");
         }*/
         //llSetMemoryLimit(65536);
+        SearchIndicators();
         g_sWearerID = llGetOwner();
     }
 
@@ -860,7 +872,7 @@ state inUpdate{
         else if(iNum == 0){
             if(sMsg == "do_move"){
 
-                if(llGetLinkNumber()==LINK_ROOT)return;
+                if(llGetLinkNumber()==LINK_ROOT || llGetLinkNumber() == 0)return;
 
                 list Parameters = llParseStringKeepNulls(llList2String(llGetLinkPrimitiveParams(llGetLinkNumber(), [PRIM_DESC]),0), ["~"],[]);
                 ExtractPart();
@@ -886,4 +898,4 @@ state inUpdate{
             }
         }
     }
-}
+}
diff --git a/src/collar/oc_bell.lsl b/src/collar/oc_bell.lsl
@@ -64,7 +64,7 @@ integer g_iHide ; // global hide
 integer CMD_OWNER = 500;
 //integer CMD_TRUSTED = 501;
 integer CMD_GROUP = 502;
-integer CMD_WEARER = 503;
+//integer CMD_WEARER = 503;
 integer CMD_EVERYONE = 504;
 //integer CMD_RLV_RELAY = 507;
 //integer CMD_SAFEWORD = 510;
@@ -440,4 +440,4 @@ default {
         }
 */
     }
-}
+}
diff --git a/src/collar/oc_com.lsl b/src/collar/oc_com.lsl
@@ -22,7 +22,6 @@ string g_sPrefix = ".";
 
 integer g_iPublicListener;
 integer g_iPrivateListener;
-integer g_iLockMeisterListener;
 integer g_iLeashPrim;
 
 integer g_iHUDListener;
@@ -33,7 +32,7 @@ integer CMD_ZERO = 0;
 integer CMD_OWNER = 500;
 //integer CMD_TRUSTED = 501;
 //integer CMD_GROUP = 502;
-integer CMD_WEARER = 503;
+//integer CMD_WEARER = 503;
 integer CMD_EVERYONE = 504;
 //integer CMD_RLV_RELAY = 507;
 integer CMD_SAFEWORD = 510;
@@ -55,7 +54,7 @@ integer LM_SETTING_DELETE = 2003;
 //integer MENUNAME_RESPONSE = 3001;
 integer TOUCH_REQUEST = -9500;
 integer TOUCH_CANCEL = -9501;
-integer TOUCH_RESPONSE = -9502;
+//integer TOUCH_RESPONSE = -9502;
 integer TOUCH_EXPIRE = -9503;
 
 integer MVANIM_INIT = 13000;
@@ -83,15 +82,15 @@ string g_sWearerName;
 list g_lTouchRequests; // 4-strided list in form of touchid, recipient, flags, auth level
 integer g_iStrideLength = 4;
 
-integer FLAG_TOUCHSTART = 0x01;
-integer FLAG_TOUCHEND = 0x02;
+//integer FLAG_TOUCHSTART = 0x01;
+//integer FLAG_TOUCHEND = 0x02;
 
 integer g_iNeedsPose = FALSE;  // should the avatar be forced into a still pose for making touching easier
 string g_sPOSE_ANIM = "turn_180";
 
 integer g_iTouchNotify = FALSE;  // for Touch Notify
 integer g_iHighlander = TRUE;
-integer g_iVerify;
+//integer g_iVerify;
 /*integer g_iProfiled;
 Debug(string sStr) {
     //if you delete the first // from the preceeding and following  lines,
@@ -539,4 +538,4 @@ state inUpdate{
     link_message(integer iSender, integer iNum, string sMsg, key kID){
         if(iNum == REBOOT)llResetScript();
     }
-}
+}
diff --git a/src/collar/oc_couples.lsl b/src/collar/oc_couples.lsl
@@ -68,7 +68,7 @@ integer g_iVerbose = TRUE;
 integer CMD_OWNER = 500;
 //integer CMD_TRUSTED = 501;
 //integer CMD_GROUP = 502;
-integer CMD_WEARER = 503;
+//integer CMD_WEARER = 503;
 integer CMD_EVERYONE = 504;
 //integer CMD_RLV_RELAY = 507;
 //integer CMD_SAFEWORD = 510;
@@ -517,4 +517,4 @@ state inUpdate{
     link_message(integer iSender, integer iNum, string sMsg, key kID){
         if(iNum == REBOOT)llResetScript();
     }
-}
+}
diff --git a/src/collar/oc_dialog.lsl b/src/collar/oc_dialog.lsl
@@ -507,6 +507,7 @@ default {
             state inUpdate;
         }
         g_kWearer=llGetOwner();
+        SearchIndicators();
         g_sPrefix = llToLower(llGetSubString(llKey2Name(llGetOwner()), 0,1));
         g_sWearerName = NameURI(g_kWearer);
         g_sDeviceName = llList2String(llGetLinkPrimitiveParams(1,[PRIM_DESC]),0);
@@ -761,7 +762,7 @@ state inUpdate{
         else if(iNum == 0){
             if(sMsg == "do_move"){
 
-                if(llGetLinkNumber()==LINK_ROOT)return;
+                if(llGetLinkNumber()==LINK_ROOT || llGetLinkNumber() == 0)return;
 
                 list Parameters = llParseStringKeepNulls(llList2String(llGetLinkPrimitiveParams(llGetLinkNumber(), [PRIM_DESC]),0), ["~"],[]);
                 ExtractPart();
@@ -787,4 +788,4 @@ state inUpdate{
             }
         }
     }
-}
+}
diff --git a/src/collar/oc_folders.lsl b/src/collar/oc_folders.lsl
@@ -6,6 +6,7 @@
 
 string g_sScriptVersion = "7.4";
 integer LINK_CMD_DEBUG=1999;
+/*
 DebugOutput(key kID, list ITEMS){
     integer i=0;
     integer end=llGetListLength(ITEMS);
@@ -14,7 +15,7 @@ DebugOutput(key kID, list ITEMS){
         final+=llList2String(ITEMS,i)+" ";
     }
     llInstantMessage(kID, llGetScriptName() +final);
-}
+}*/
 
 string g_sParentMenu = "RLV";
 
@@ -25,7 +26,7 @@ string g_sSubMenu = "# Folders";
 integer CMD_OWNER = 500;
 integer CMD_TRUSTED = 501;
 integer CMD_GROUP = 502;
-integer CMD_WEARER = 503;
+//integer CMD_WEARER = 503;
 integer CMD_EVERYONE = 504;
 //integer CMD_RLV_RELAY = 507;
 //integer CMD_SAFEWORD = 510;
@@ -815,4 +816,4 @@ integer iMenuIndex = llListFindList(g_lMenuIDs, [kID]);
         llListenRemove(g_iListener);
         llSetTimerEvent(0.0);
     }
-}
+}
diff --git a/src/collar/oc_particle.lsl b/src/collar/oc_particle.lsl
@@ -40,8 +40,8 @@ integer DIALOG_TIMEOUT      = -9002;
 integer g_iChan_LOCKMEISTER = -8888;
 integer g_iChan_LOCKGUARD   = -9119;
 integer g_iChan_OCChain = -9889;                   // OpenCollar Chain CMD Channel (for cuff compatibility)
-integer g_iLMListener;
-integer g_iLMListernerDetach;
+//integer g_iLMListener;
+//integer g_iLMListernerDetach;
 
 integer CMD_PARTICLE = 20000;
 
@@ -465,11 +465,11 @@ DebugOutput(key kID, list ITEMS){
 
 HandleOccCMD(string sCMD){
     list lOcCMD = llParseString2List(sCMD, [":"],[]);
-    string sCMD = llList2String(lOcCMD,0);
-    if (sCMD == "occhains") ParseOcChains(llList2String(lOcCMD,1));         // Request keys
-    else if (sCMD == "occhain") doOcChain(llList2String(lOcCMD,1));         // Request Chain
-    else if (sCMD == "clearchain") doClearChain(llList2String(lOcCMD,1));   // Clear Chain
-    else if (sCMD == "chaintex" && g_sOccParticleTexture != llList2Key(lOcCMD,1)) {
+    string sCMDs = llList2String(lOcCMD,0);
+    if (sCMDs == "occhains") ParseOcChains(llList2String(lOcCMD,1));         // Request keys
+    else if (sCMDs == "occhain") doOcChain(llList2String(lOcCMD,1));         // Request Chain
+    else if (sCMDs == "clearchain") doClearChain(llList2String(lOcCMD,1));   // Clear Chain
+    else if (sCMDs == "chaintex" && g_sOccParticleTexture != llList2Key(lOcCMD,1)) {
         g_sOccParticleTexture = llList2Key(lOcCMD,1);
         list lActiveChains = g_lCurrentChains;
         doClearChain("all"); // Restart all Chains so the change can be seen live!
@@ -844,4 +844,4 @@ default {
         }*/
     }
 
-}
+}