Merge branch 'master' into sl

If slider for heel and platform are fully to the right,
each is 10cm height difference

.gitattributes

@@ -0,0 +1 @@
+*.lsl text eol=lf

README.md

@@ -2,10 +2,6 @@
 
 OsCollar is a set of gadgets for submission roleplay for use in the OpenSim metaverse
 
-Grid and sim owners might want to read [opensim patches](doc/opensim-patches.md)
-
-For help and chatter, join us on [Matrix](https://matrix.to/#/#oscollar:matrix.org)
-
 
 #### Finding your way around this repo
 ```
@@ -29,13 +25,17 @@ For help and chatter, join us on [Matrix](https://matrix.to/#/#oscollar:matrix.o
         > installer: The source code for the updater aka patch
         > remote: The source code for the remote control HUD.
         > spares: Spares and snippets for research and development.
+
+    > web: Files for the updater check within the Help/About menu
 ```
 
 #### Requirements
 
-Simulator: OpenSim 0.9.1.0 or newer
-XEngine or YEngine (YEngine strongly recommended!)
+Simulator: 0.9.3.1 or newer
+or
+Dreamgrid: 7.04 or newer
 
-Note that as soon as YEngine becomes the default in a forthcoming OpenSim release, we will drop XEngine support. High quality grids already have set YEngine as default, or at least give simowners the option to enable it.
+- Teleporting to a sim running older versions of OpenSim may result in loss of settings (linkset data) and loss of functionality (non-running scripts)
+- Teleporting to a hypergrid sim may result in scripts to stop running and/or reset, unless the destination sim is patched
 
-UUIDs referenced by code and notecards refer to assets on the OsGrid.org asset server
+To avoid problems, the general advice is to only use this on your home grid meeting the minimal requirements or better.

doc/opensim-patches.md

@@ -1,6 +1,8 @@
 Recommended patches for OpenSim
 
-You wouldn't believe how often I got a "bug report" for what is actually a bug in OpenSim itself. Unfortunately the core devs don't see the urgency to address these problems in mainstream OpenSim, so you'll have to patch the OpenSim sourcecode yourself!
+Often we get a "bug report" for what is actually a known bug in OpenSim itself. Unfortunately the core devs don't see the urgency to address these problems, so you'll have to patch the OpenSim sourcecode yourself!
+
+Alternatively, run my own [OpenSim fork](https://github.com/lickx/opensim-lickx) in which this all is fixed
 
 [Mantis 8366](http://opensimulator.org/mantis/view.php?id=8366)  
 This fixes state being lost or even non-working scripts for any hypergrid visitors you receive at your sim. If you have been wondering why your collar (and other scripted attachments) lost any and all settings when hypergridding, this is it. The destination sim will have to apply these patches.
@@ -8,8 +10,9 @@ This fixes state being lost or even non-working scripts for any hypergrid visito
 [Mantis 8366](http://opensimulator.org/mantis/view.php?id=8366) and [Mantis 9052](http://opensimulator.org/mantis/view.php?id=9052)  
 After a TP to the hypergrid, your attachments won't be set to the active group tag for that grid, which is needed if you allow access from that group on the collar. The destination sim will have to apply these patches.
 
-[Mantis 6311](http://opensimulator.org/mantis/view.php?id=6311) [Patch here](https://github.com/lickx/opensim-lickx/wiki/6311) 
-This affects RLVa, when declining a folder given to your shared #RLV folder by a scripted object/trap. Accepting seems to be working now since OpenSim 0.9.2, decline will only work correctly after this patch is applied.
+[Mantis 6311](http://opensimulator.org/mantis/view.php?id=6311)
+This affects RLVa, when declining a folder given to your shared #RLV folder by a scripted object/trap. Accepting works since OpenSim 0.9.2, decline will only work correctly after a patch is applied. Basically the object url in a inventory offer message HAS to start with http://slurl because RLVa is hardcoded like that. http://slurl.yourgrid.com is fine for example.
 
 [Mantis 8250](http://opensimulator.org/mantis/view.php?id=8250)  
 If your leashed sub has been bunny hopping or is stuck when walking up or down a hill, stairs, or other kind of slope, this patch fixes that leash weirdness.
+

res/textures/README.md

@@ -15,8 +15,4 @@ Free software for 3D assets creation:
 * [Blender](https://blender.org/)
 
 License:
-* The official OpenCollar logos and derivatives are trademark and property of their respective owners and may not be used without prior express permission.
-
-* Button textures, which are generally prefixed with button_ in their name, may only be used with express permission.
-
-* All other textures and binaries contributed to this repository, with exception of those stated above, are licensed under a [Creative Commons Attribution-ShareAlike 4.0 International Public License](https://creativecommons.org/licenses/by-sa/4.0/)
+* All textures and binaries contributed to this repository are licensed under a [Creative Commons Attribution-ShareAlike 4.0 International Public License](https://creativecommons.org/licenses/by-sa/4.0/)

src/ao/oc_ao.lsl

@@ -19,7 +19,7 @@
 
 // Debug(string sStr) { llOwnerSay("Debug ["+llGetScriptName()+"]: " + sStr); }
 
-string g_sVersion = "2023.09.06";
+string g_sVersion = "2025.12";
 
 integer g_iInterfaceChannel = -12587429;
 integer g_iHUDChannel = -1812221819;
@@ -83,12 +83,6 @@ integer g_iRlvListener;
 integer RLV_MAX_CHECKS = 5;
 integer g_iRLVOn = FALSE;
 
-integer g_iShoeChannel;
-integer g_iShoeListener;
-integer g_iShoesWorn;
-float g_fHeelOffset = -0.1;
-integer g_iOffsetAdjustHandle;
-
 integer g_iTimerRlvDetect;
 integer g_iTimerChangeStand;
 integer g_iTimerDialogTimeout;
@@ -109,7 +103,7 @@ FindButtons()
     g_lPrimOrder = [0, LINK_ROOT];  //  '1' - root prim
     integer i;
     for (i = 2; i <= llGetNumberOfPrims(); ++i) {
-        g_lButtons += llGetLinkName(i);
+        g_lButtons += [llGetLinkName(i)];
         g_lPrimOrder += i;
     }
 }
@@ -118,17 +112,17 @@ DoTextures(string style)
 {
     list lTextures = [
     "Dark",
-    "Minimize~button_dark_opensim",
-    "Power~button_dark_io",
-    "SitAny~button_dark_groundsit",
-    "Menu~button_dark_menu",
-    "Device~button_dark_device",
+    "Minimize~dc120517-1ff3-11fd-5ea8-f34423a7a664",
+    "Power~932903e4-5054-9cc1-04da-7b18379e2fa3",
+    "SitAny~a0909a18-f525-a40c-9201-9a7a5634b2de",
+    "Menu~b68efeba-0a3b-6eff-5b18-9fbb3833eeca",
+    "Device~4c811a48-7dce-8a7f-0ee8-1af22fa0099a",
     "Light",
-    "Minimize~button_light_opensim",
-    "Power~button_light_io",
-    "SitAny~button_light_groundsit",
-    "Menu~button_light_menu",
-    "Device~button_light_device"
+    "Minimize~9ddcd586-ecd7-5662-7482-bc4089fe09e8",
+    "Power~8ebe634c-3243-3443-6017-16afa20ee421",
+    "SitAny~182c14e4-a9c8-e71f-38bd-d91716abb782",
+    "Menu~4c963ffd-d948-b8d4-7290-12e11d650e56",
+    "Device~6e950b0b-3cc7-ef75-7885-8689d2b9a5e7"
     ];
     integer i = llListFindList(lTextures, [style]);
     integer iEnd = i + (llGetListLength(lTextures)/2) - 1;
@@ -145,7 +139,6 @@ DoTextures(string style)
         }
     }
     g_sStyle = style;
-    StoreSettings();
 }
 
 DefinePosition()
@@ -281,18 +274,11 @@ ToggleSitAnywhere()
         if (g_iSitAnywhereOn) {
             if (g_iChangeInterval) g_iTimerChangeStand = llGetUnixTime() + g_iChangeInterval;
             SwitchStand();
-            if (g_iRLVOn) {
-                llOwnerSay("@adjustheight:1;0;0.0=force");
-                llListenRemove(g_iOffsetAdjustHandle);
-            }
+            if (g_iRLVOn) llOwnerSay("@adjustheight:1;0;0.0=force");
         } else {
             g_iTimerChangeStand = 0;
             llSetAnimationOverride("Standing",g_sSitAnywhereAnim);
-            if (g_iRLVOn) {
-                AdjustSitOffset();
-                llOwnerSay("Use /2offset <float> to adjust SitAnywhere offset in meters");
-                g_iOffsetAdjustHandle = llListen(2, "", (string)g_kWearer, "");
-            }
+            if (g_iRLVOn) AdjustSitOffset();
         }
         g_iSitAnywhereOn = !g_iSitAnywhereOn;
         DoStatus();
@@ -301,10 +287,9 @@ ToggleSitAnywhere()
 
 AdjustSitOffset()
 {
-    if (g_iShoesWorn)
-        llOwnerSay("@adjustheight:1;0;"+(string)(g_fSitOffset+g_fHeelOffset)+"=force");
-    else
-        llOwnerSay("@adjustheight:1;0;"+(string)g_fSitOffset+"=force");
+    list l = llGetVisualParams(g_kWearer, ["heel_height", "platform_height"]);
+    float fHeelOffset = (llList2Float(l, 0) + llList2Float(l, 1)) / 100.0;
+    llOwnerSay("@adjustheight:1;0;"+(string)(g_fSitOffset+fHeelOffset)+"=force");
 }
 
 Notify(key kID, string sStr, integer iAlsoNotifyWearer)
@@ -342,7 +327,7 @@ list SortButtons(list lButtons, list lStaticButtons)
         lAllButtons = lButtons + lStaticButtons;
     }
     while (llGetListLength(lAllButtons) % 3 != 0 && llGetListLength(lAllButtons) < 12) {
-        lSpacers += "-";
+        lSpacers += ["-"];
         lAllButtons = lButtons + lSpacers + lStaticButtons;
     }
     integer i = llListFindList(lAllButtons, ["BACK"]);
@@ -357,7 +342,7 @@ list SortButtons(list lButtons, list lStaticButtons)
 
 MenuAO(key kID)
 {
-    string sPrompt = "\n𝐎 𝐒 𝐂 𝐨 𝐥 𝐥 𝐚 𝐫  AO\t"+g_sVersion;
+    string sPrompt = "\nOsCollar - AO\t"+g_sVersion;
     list lButtons = ["LOCK"];
     if (g_iLocked) lButtons = ["UNLOCK"];
     if (kID == g_kWearer) lButtons += ["Collar Menu"];
@@ -369,7 +354,7 @@ MenuAO(key kID)
     else lButtons += ["Shuffle ☐"];
     lButtons += ["Stand Time","Next Stand"];
     if (kID == g_kWearer) lButtons += ["HUD Style"];
-    Dialog(kID, sPrompt, lButtons, ["Cancel"], "AO");
+    Dialog(kID, sPrompt, lButtons, ["Close"], "AO");
 }
 
 MenuLoad(key kID, integer iPage)
@@ -403,7 +388,7 @@ MenuLoad(key kID, integer iPage)
         g_iNumberOfPages = llGetListLength(lButtons) / 9;
         lButtons = llList2List(lButtons, iPage*9, iPage*9+8);
     }
-    if (llGetListLength(lButtons) == 0) llOwnerSay("There aren't any animation sets installed!");
+    if (lButtons == []) llOwnerSay("There aren't any animation sets installed!");
     Dialog(kID, sPrompt, lButtons, lStaticButtons,"Load");
 }
 
@@ -432,7 +417,7 @@ MenuChooseAnim(key kID, string sAnimState, integer iUpDown)
     integer iEnd = llGetListLength(g_lAnims2Choose);
     integer i = 0;
     while (++i <= iEnd) {
-        lButtons += (string)i;
+        lButtons += [(string)i];
         sPrompt += "\n"+(string)i+": "+llList2String(g_lAnims2Choose, i-1);
     }
     if (iUpDown) Dialog(kID, sPrompt, lButtons, ["▲", "▼", "BACK"], sAnimState);
@@ -469,7 +454,7 @@ TranslateCollarCMD(string sCommand, key kID)
     if (llSubStringIndex(sCommand,"stand") == 0) {
         if (llSubStringIndex(sCommand, "off") != -1) {
             g_iStandPause = TRUE;
-            if (llGetAnimationOverride("Standing") != "")
+            if (llGetAnimationOverride("Standing"))
                 llResetAnimationOverride("Standing");
             llResetAnimationOverride("Turning Left");
             llResetAnimationOverride("Turning Right");
@@ -501,11 +486,13 @@ Command(key kID, string sCommand)
         MenuLoad(kID,0);
         return;
     } else if (sCommand == "on") {
+        if ((llGetPermissions() & PERMISSION_OVERRIDE_ANIMATIONS) == 0) llRequestPermissions(g_kWearer, PERMISSION_OVERRIDE_ANIMATIONS);
         SetAnimOverride();
         g_iAO_ON = TRUE;
         if (g_iChangeInterval) g_iTimerChangeStand = llGetUnixTime() + g_iChangeInterval;
         DoStatus();
     } else if (sCommand == "off") {
+        if ((llGetPermissions() & PERMISSION_OVERRIDE_ANIMATIONS) == 0) llRequestPermissions(g_kWearer, PERMISSION_OVERRIDE_ANIMATIONS);
         llResetAnimationOverride("ALL");
         g_iAO_ON = FALSE;
         g_iTimerChangeStand = 0;
@@ -547,73 +534,12 @@ StartUpdate(key kID)
     llRegionSayTo(kID, -7483220, "ready|" + (string)iPin);
 }
 
-StoreSettings()
-{
-    string sSettings;
-    string sOldSettings;
-    sSettings += "on="+(string)g_iAO_ON;
-    sSettings += "~card="+g_sCard;
-    sSettings += "~i="+(string)g_iChangeInterval;
-    sSettings += "~l="+(string)g_iLocked;
-    sSettings += "~rnd="+(string)g_iShuffle;
-    sSettings += "~sp="+(string)g_iStandPause;
-    sSettings += "~st="+g_sStyle;
-    // Now write them away only if changed (to spare the asset server):
-    sOldSettings = llList2String(llGetLinkPrimitiveParams(osGetLinkNumber("Menu"), [PRIM_DESC]), 0);
-    if (sOldSettings != sSettings)
-        llSetLinkPrimitiveParamsFast(osGetLinkNumber("Menu"), [PRIM_DESC, sSettings]);
-    // Put g_sWalkAnim on a seperate prim, as max desc length is 63 characters:
-    sSettings = "wa="+g_sWalkAnim;
-    sOldSettings = llList2String(llGetLinkPrimitiveParams(osGetLinkNumber("Power"), [PRIM_DESC]), 0);
-    if (sOldSettings != sSettings)
-        llSetLinkPrimitiveParamsFast(osGetLinkNumber("Power"), [PRIM_DESC, sSettings]);
-    // Put sit settings on a seperate prim, as max desc length is 63 characters:
-    sSettings = "~s="+(string)g_iSitAnimOn;
-    sSettings += "~so="+llGetSubString((string)g_fSitOffset, 0, 3);
-    sSettings += "~sa="+g_sSitAnim;
-    sOldSettings = llList2String(llGetLinkPrimitiveParams(osGetLinkNumber("SitAny"), [PRIM_DESC]), 0);
-    if (sOldSettings != sSettings)
-        llSetLinkPrimitiveParamsFast(osGetLinkNumber("SitAny"), [PRIM_DESC, sSettings]);
-    // Clean up root prim description if needed as we don't use it:
-    sOldSettings = llList2String(llGetLinkPrimitiveParams(LINK_ROOT, [PRIM_DESC]), 0);
-    if (llSubStringIndex(sOldSettings, "~") != -1)
-        llSetLinkPrimitiveParamsFast(LINK_ROOT, [PRIM_DESC, ""]);
-}
-
-RestoreSettings()
-{
-    integer iLink = LINK_ROOT;
-    for (iLink = LINK_ROOT; iLink <= llGetNumberOfPrims(); iLink++) {
-        string sSettings = llList2String(llGetLinkPrimitiveParams(iLink, [PRIM_DESC]), 0);
-        list lSettings = llParseString2List(sSettings, ["~","="], []);
-        integer i;
-        for (i = 0; i < llGetListLength(lSettings); i += 2) {
-            string sKey = llList2String(lSettings, i);
-            string sValue = llList2String(lSettings, i + 1);
-            if (sKey == "on") g_iAO_ON = (integer)sValue;
-            else if (sKey == "card") g_sCard = sValue;
-            else if (sKey == "s") g_iSitAnimOn = (integer)sValue;
-            else if (sKey == "sa") g_sSitAnim = sValue;
-            else if (sKey == "wa") g_sWalkAnim = sValue;
-            else if (sKey == "i") g_iChangeInterval = (integer)sValue;
-            else if (sKey == "l") g_iLocked = (integer)sValue;
-            else if (sKey == "rnd") g_iShuffle = (integer)sValue;
-            else if (sKey == "sp") g_iStandPause = (integer)sValue;
-            else if (sKey == "so") g_fSitOffset = (float)sValue;
-            else if (sKey == "st") g_sStyle = sValue;
-        }
-    }
-}
-
 default
 {
     state_entry()
     {
         if (llGetInventoryType("oc_installer_sys") == INVENTORY_SCRIPT) return;
-        string sObjectName = osReplaceString(llGetObjectName(), "\\d+\\.\\d+\\.?\\d+", g_sVersion, -1, 0);
-        if (sObjectName != llGetObjectName()) llSetObjectName(sObjectName);
         g_kWearer = llGetOwner();
-        RestoreSettings();
         g_iInterfaceChannel = -llAbs((integer)("0x" + llGetSubString(g_kWearer,30,-1)));
         llListen(g_iInterfaceChannel, "", "", "");
         g_iHUDChannel = -llAbs((integer)("0x"+llGetSubString((string)llGetOwner(),-7,-1)));
@@ -626,18 +552,18 @@ default
             g_sJson_Anims = "{}";
             g_kCard = llGetNotecardLine(g_sCard, g_iCardLine);
         } else MenuLoad(g_kWearer,0);
+        g_iTimerRlvDetect = llGetUnixTime() + 120;
         g_iRLVOn = FALSE;
         g_iTimerRlvDetect = llGetUnixTime() + 120;
         g_iRlvListener = llListen(519274, "", (string)g_kWearer, "");
         g_iRlvChecks = 0;
         llOwnerSay("@versionnew=519274");
-        llSetTimerEvent(5.0);
+        llSetTimerEvent(30.0);
     }
 
     on_rez(integer iStart)
     {
         if (g_kWearer != llGetOwner()) llResetScript();
-        RestoreSettings();
         g_iReady = FALSE;
         if (llGetAttached()) {
             if (g_iLocked) llOwnerSay("@detach=n");
@@ -651,14 +577,7 @@ default
 
     attach(key kID)
     {
-        if (kID == NULL_KEY) {
-            llResetAnimationOverride("ALL");
-            if (g_iRLVOn) {
-                // de-register worn and unworn events (if it gets through)
-                llOwnerSay("@notify:"+(string)g_iShoeChannel+";worn legally shoes=rem");
-                llOwnerSay("@notify:"+(string)g_iShoeChannel+";unworn legally shoes=rem");
-            }
-        }
+        if (kID == NULL_KEY) llResetAnimationOverride("ALL");
         else if (llGetAttached() <= 30) {
             llOwnerSay("Sorry, this device can only be attached to the HUD.");
             llRequestPermissions(kID, PERMISSION_ATTACH);
@@ -720,53 +639,10 @@ default
                     TranslateCollarCMD(llList2String(lParams, 2), llList2Key(lParams, 3));
             }
         } else if (iChannel == 519274) {
+            g_iTimerRlvDetect = 0;
             g_iRLVOn = TRUE;
             llListenRemove(g_iRlvListener);
-            g_iShoeChannel = (9999 + llRound(llFrand(9999999.0)));
-            llListenRemove(g_iShoeListener);
-            g_iShoeListener = llListen(g_iShoeChannel, "", (string)g_kWearer, "");
-            // get initial state of shoes worn or not:
-            llOwnerSay("@getoutfit="+(string)g_iShoeChannel);
-        } else if (iChannel==g_iShoeChannel) {
-            if (sMessage  == "/unworn legally shoes") {
-                g_iShoesWorn = FALSE;
-                if (g_iSitAnywhereOn) AdjustSitOffset();
-            } else if (sMessage == "/worn legally shoes") {
-                g_iShoesWorn = TRUE;
-                if (g_iSitAnywhereOn) AdjustSitOffset();
-            } else if (llGetSubString(sMessage, 0, 6) != "/notify") {
-                // @getoutfit result (a string of 1's and 0's)
-                string sFlagShoes = llGetSubString(sMessage, 4, 4);
-                if (sFlagShoes == "1" || sFlagShoes == "0")
-                {
-                    g_iShoesWorn = (integer)llGetSubString(sMessage, 4, 4);
-                    if (g_iSitAnywhereOn) AdjustSitOffset();
-                    // Register to be notified of worn and unworn
-                    llOwnerSay("@notify:"+(string)g_iShoeChannel+";worn legally shoes=add");
-                    llOwnerSay("@notify:"+(string)g_iShoeChannel+";unworn legally shoes=add");
-                }
-            }
-        } else if (iChannel == 2) {
-            list lCmd = llParseString2List(sMessage, [" "], []);
-            if (llStringTrim(llList2String(lCmd, 0), STRING_TRIM) != "offset") return;
-            string sParam1 = llStringTrim(llList2String(lCmd, 1), STRING_TRIM);
-            float fValue;
-            if (llGetListLength(lCmd) == 3) { // /2offset + 0.05
-                float fParam2 = (float)llList2String(lCmd, 2);
-                if (sParam1 == "+") fValue = g_fSitOffset + fParam2;
-                else if (sParam1 == "-") fValue = g_fSitOffset - fParam2;
-                else fValue = (float)sParam1; // ignore param 2
-            } else if (llGetListLength(lCmd) == 2) { // /2offset +0.05
-                float fParam2 = (float)llGetSubString(sParam1, 1, -1);
-                string sMod = llGetSubString(sParam1, 0, 0);
-                if (sMod == "+") fValue = g_fSitOffset + fParam2;
-                else if (sMod == "-") fValue = g_fSitOffset - fParam2;
-                else fValue = (float)sParam1;
-            }
-            g_fSitOffset = fValue;
-            StoreSettings();
-            AdjustSitOffset();
-            llOwnerSay("New SitAnywhere offset "+llGetSubString((string)g_fSitOffset, 0, 4)+" stored");
+            llSetTimerEvent(5.0);
         } else if (llListFindList(g_lMenuIDs,[kID, iChannel]) != -1) {
             integer iMenuIndex = llListFindList(g_lMenuIDs, [kID]);
             string sMenuType = llList2String(g_lMenuIDs, iMenuIndex+4);
@@ -774,7 +650,7 @@ default
             g_lMenuIDs = llDeleteSubList(g_lMenuIDs, iMenuIndex, iMenuIndex+4);
             if (llGetListLength(g_lMenuIDs) == 0 && g_iTimerDialogTimeout) g_iTimerDialogTimeout = 0;
             if (sMenuType == "AO") {
-                if (sMessage == "Cancel") return;
+                if (sMessage == "Close") return;
                 else if (sMessage == "-") MenuAO(kID);
                 else if (sMessage == "Collar Menu") llRegionSayTo(g_kWearer, g_iHUDChannel, (string)g_kWearer+":menu");
                 else if (llSubStringIndex(sMessage,"LOCK") != -1) {
@@ -789,7 +665,7 @@ default
                     if (llSubStringIndex(sMessage,"☑") >= 0) {
                         g_iSitAnimOn = FALSE;
                         llResetAnimationOverride("Sitting");
-                    } else if (g_sSitAnim != "") {
+                    } else if (g_sSitAnim) {
                         g_iSitAnimOn = TRUE;
                         if (g_iAO_ON) llSetAnimationOverride("Sitting", g_sSitAnim);
                     } else Notify(kID,"Sorry, the currently loaded animation set doesn't have any sits.",TRUE);
@@ -803,7 +679,6 @@ default
                     else g_iShuffle = TRUE;
                     MenuAO(kID);
                 }
-                StoreSettings();
             } else if (sMenuType == "Load") {
                 integer index = llListFindList(g_lCustomCards, [sMessage]);
                 if (index != -1) sMessage = llList2String(g_lCustomCards, index-1);
@@ -840,15 +715,10 @@ default
             } else if (llListFindList(["Walking","Sitting on Ground","Sitting"], [sMenuType]) != -1) {
                 if (sMessage == "BACK") {
                     g_lAnims2Choose = [];
-                    if (sMenuType == "Sitting on Ground" && g_iSitAnywhereOn) {
-                        ToggleSitAnywhere();
-                        DoStatus();
-                    }
                     MenuAO(kID);
                 } else if (sMessage == "▲" || sMessage == "▼") {
                     if (sMessage == "▲") g_fSitOffset += 0.025;
                     else g_fSitOffset -= 0.025;
-                    StoreSettings();
                     AdjustSitOffset();
                     MenuChooseAnim(kID, sMenuType, TRUE);
                 } else if (sMessage == "-") {
@@ -941,6 +811,7 @@ default
                 llListenRemove(g_iRlvListener);
                 g_iRlvChecks = 0;
                 g_iRLVOn = FALSE;
+                llSetTimerEvent(5.0);
             }
         }
     }
@@ -964,12 +835,12 @@ default
                         g_sSitAnywhereAnim = llList2String(lTemp, 0);
                     else if (sAnimationState == "Sitting") {
                         g_sSitAnim = llList2String(lTemp, 0);
-                        if (g_sSitAnim != "") g_iSitAnimOn = TRUE;
+                        if (g_sSitAnim) g_iSitAnimOn = TRUE;
                         else g_iSitAnimOn = FALSE;
                     } else if (sAnimationState == "Walking")
                         g_sWalkAnim = llList2String(lTemp, 0);
                     else if (sAnimationState != "Standing") lTemp = llList2List(lTemp, 0, 0);
-                    if (llGetListLength(lTemp)) g_sJson_Anims = llJsonSetValue(g_sJson_Anims, [sAnimationState], llDumpList2String(lTemp,"|"));
+                    if (lTemp != []) g_sJson_Anims = llJsonSetValue(g_sJson_Anims, [sAnimationState], llDumpList2String(lTemp,"|"));
                 }
                 @next;
                 g_kCard = llGetNotecardLine(g_sCard, ++g_iCardLine);
@@ -986,7 +857,6 @@ default
                 } else {
                     llOwnerSay("The \""+g_sCard+"\" animation set was loaded successfully.");
                     g_iAO_ON = TRUE;
-                    StoreSettings();
                 }
                 DoStatus();
                 if (llGetAttached()) llRequestPermissions(g_kWearer,PERMISSION_OVERRIDE_ANIMATIONS | PERMISSION_TAKE_CONTROLS);
@@ -1013,4 +883,4 @@ default
             if (llGetColor(0) != g_vAOoncolor) DetermineColors();
         } else if (iChange & CHANGED_LINK) llResetScript();
     }
-}
+}

src/apps/oc_camera.lsl

@@ -146,7 +146,13 @@ ClearCam()
     llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "all", "");
 }
 
-CamFocus(vector g_vCamPos, rotation g_rCamRot) {
+rotation Slerp(rotation a, rotation b, float t)
+{
+   return llAxisAngle2Rot( llRot2Axis(b /= a), t * llRot2Angle(b)) * a;
+}//Written collectively, Taken from http://forums-archive.secondlife.com/54/3b/50692/1.html
+
+CamFocus(vector g_vCamPos, rotation g_rCamRot)
+{
     vector vStartPose = llGetCameraPos();
     rotation rStartRot = llGetCameraRot();
     float fSteps = 8.0;
@@ -161,7 +167,7 @@ CamFocus(vector g_vCamPos, rotation g_rCamRot) {
     for(fCurrentStep = 0.0; fCurrentStep <= fSteps; ++fCurrentStep) {
         //Set next position in tween
         vector vNextPos = vStartPose + (vPosStep * fCurrentStep);
-        rotation rNextRot = osSlerp(rStartRot, g_rCamRot, fCurrentStep / fSteps);
+        rotation rNextRot = Slerp(rStartRot, g_rCamRot, fCurrentStep / fSteps);
          //Set camera parameters
         llSetCameraParams([
             CAMERA_ACTIVE, 1, //1 is active, 0 is inactive
@@ -219,7 +225,7 @@ ChatCamParams(integer iChannel, key kID)
 {
     g_vCamPos = llGetCameraPos();
     g_rCamRot = llGetCameraRot();
-    string sPosLine = osReplaceString((string)g_vCamPos, " ", "", -1, 0) + " " + osReplaceString((string)g_rCamRot, " ", "", -1, 0);
+    string sPosLine = llReplaceSubString((string)g_vCamPos, " ", "", 0) + " " + llReplaceSubString((string)g_rCamRot, " ", "", 0);
     //if not channel 0, say to whole region.  else just say locally
     if (iChannel > 0)
         llRegionSayTo(kID, iChannel, sPosLine);

src/device/oc_anim.lsl

@@ -69,14 +69,11 @@ integer MENUNAME_RESPONSE = 3001;
 integer RLV_CMD = 6000;
 integer RLV_OFF = 6100;
 integer RLV_VERSION = 6003;
-integer RLV_SHOES = 6108;
-integer RLV_NOSHOES = 6109;
 integer ANIM_START = 7000;
 integer ANIM_STOP = 7001;
 integer ANIM_LIST_REQUEST = 7002;
 integer ANIM_LIST_RESPONSE =7003;
 float g_fStandHover = 0.0;
-integer g_iShoesWorn = FALSE;
 
 integer REGION_TELEPORT = 10051;
 
@@ -91,8 +88,6 @@ key g_kWearer = NULL_KEY;
 list g_lMenuIDs;
 integer g_iMenuStride = 3;
 
-float g_fHeelOffset = -0.1;
-
 Dialog(key kID, string sPrompt, list lChoices, list lUtilityButtons, integer iPage, integer iAuth, string sName)
 {
     key kMenuID = llGenerateKey();
@@ -212,10 +207,11 @@ SetHover(string sStr)
     } else g_lHeightAdjustments += [g_sCurrentPose, fNewHover];
     @next;
     if (g_sCurrentPose == g_sCrawlWalk) g_fPoseMoveHover = fNewHover;
-    if (g_iShoesWorn)
-        llMessageLinked(LINK_RLV, RLV_CMD, "adjustheight:1;0;"+(string)(fNewHover+g_fHeelOffset)+"=force", g_kWearer);
-    else
-        llMessageLinked(LINK_RLV, RLV_CMD, "adjustheight:1;0;"+(string)fNewHover+"=force", g_kWearer);
+
+    list l = llGetVisualParams(g_kWearer, ["heel_height", "platform_height"]);
+    float fHeelOffset = (llList2Float(l, 0) + llList2Float(l, 1)) / 100.0;
+    llMessageLinked(LINK_RLV, RLV_CMD, "adjustheight:1;0;"+(string)(fNewHover+fHeelOffset)+"=force", g_kWearer);
+
     string sSettings;
     integer i;
     for (i = 0; i < llGetListLength(g_lHeightAdjustments); i += 2) {
@@ -263,7 +259,10 @@ PlayAnim(string sAnim)
         integer index = llListFindList(g_lHeightAdjustments, [sAnim]);
         float fOffset = 0.0;
         if (index != -1) fOffset += llList2Float(g_lHeightAdjustments, index+1);
-        if (g_iShoesWorn) fOffset += g_fHeelOffset;
+
+        list l = llGetVisualParams(g_kWearer, ["heel_height", "platform_height"]);
+        fOffset += (llList2Float(l, 0) + llList2Float(l, 1)) / 100.0;
+
         llMessageLinked(LINK_RLV, RLV_CMD, "adjustheight:1;0;"+(string)fOffset+"=force", g_kWearer);
     }
     llStartAnimation(sAnim);
@@ -321,20 +320,6 @@ CreateAnimList()
     llMessageLinked(LINK_SET, ANIM_LIST_RESPONSE, llDumpList2String(g_lPoseList+g_lOtherAnims,"|"), "");
 }
 
-// Case insensitive match of sName against any inventory item of type iType
-// Returns actual inventory name when matched
-// Returns empty string if no match
-string MatchInventoryName(string sName, integer iType)
-{
-    integer i = 0;
-    while (i < llGetInventoryNumber(iType)) {
-        string sItemName = llGetInventoryName(iType, i);
-        if (llSubStringIndex(llToLower(sItemName), llToLower(sName)) == 0) return sItemName;
-        i++;
-    }
-    return "";
-}
-
 UserCommand(integer iNum, string sStr, key kID)
 {
     if (iNum == CMD_EVERYONE) return;
@@ -440,25 +425,16 @@ UserCommand(integer iNum, string sStr, key kID)
                 if (llList2String(lParams,2) == "") llMessageLinked(LINK_DIALOG, NOTIFY, "1"+"Crawl mode deactivated.", kID);
             }
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Only owners or the wearer can change crawl settings.",kID);
-    } else if (sCommand == "heeloffset") {
-        if ((iNum == CMD_OWNER) || (kID == g_kWearer)) {
-            if (sValue == "reset" || sValue != "") {
-                g_fHeelOffset = -0.1;
-                llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken+"heeloffset", "");
-                llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"heeloffset has been reset to "+llGetSubString((string)g_fHeelOffset, 0, 4), g_kWearer);
-            } else {
-                g_fHeelOffset = (float)sValue;
-                llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken+"heeloffset="+(string)g_fHeelOffset, "");
-                llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"heeloffset changed to "+llGetSubString((string)g_fHeelOffset, 0, 4), g_kWearer);
-            }
-        } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Only owners or the wearer can change the heel offset.", kID);
+    } else if (sStr == "resetposes") {
+        // this will wipe out all custom-set height adjustments!
+        g_lHeightAdjustments = [];
+        llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, "offset_hovers", "");
+        llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"All height adjustments for poses have been reset.", kID);
     } else {
         // Check if given command is a pose in inv, and if so play it
         if (llStringLength(sStr) > 63) return; // inv item names can only have up to 63 chars
-        if (llGetInventoryType(sStr) != INVENTORY_ANIMATION) {
-            sStr = MatchInventoryName(sStr, INVENTORY_ANIMATION);
-            if (sStr == "") return; // no match in aNy cAsE
-        } // else sStr is an exact match
+        if (llGetInventoryType(sStr) != INVENTORY_ANIMATION) return;
+        // else sStr is an exact match:
         if (iNum <= g_iLastRank || g_iAnimLock == FALSE || g_sCurrentPose == "") {
             StopAnim(g_sCurrentPose,(g_sCurrentPose != ""));
             g_sCurrentPose = sStr;
@@ -566,7 +542,7 @@ default
                 else if (sToken == "crawl") {
                     g_iCrawl = (integer)sValue;
                     checkCrawl();
-                } else if (sToken == "heeloffset") g_fHeelOffset = (float)sValue;
+                }
             } else if (llGetSubString(sToken, 0, i) == "offset_") {
                 sToken = llGetSubString(sToken, i+1, -1);
                 if (sToken == "AllowHover") {
@@ -658,8 +634,6 @@ default
             else if (sStr == "LINK_REQUEST") llMessageLinked(LINK_ALL_OTHERS, LINK_UPDATE, "LINK_ANIM", "");
         } else if (iNum == REBOOT && sStr == "reboot") llResetScript();
         else if (iNum == RLV_VERSION) g_iRLV_ON = TRUE;
-        else if (iNum == RLV_SHOES) g_iShoesWorn = TRUE;
-        else if (iNum == RLV_NOSHOES) g_iShoesWorn = FALSE;
         else if (iNum == RLV_OFF) g_iRLV_ON = FALSE;
         else if (iNum == REGION_TELEPORT) RefreshAnim();
     }
@@ -697,7 +671,9 @@ default
                 fHover = 0.0;
                 integer index = llListFindList(g_lHeightAdjustments, [g_sCurrentPose]);
                 if (index != -1) fHover = llList2Float(g_lHeightAdjustments, index+1);
-                if (g_iShoesWorn) fHover += g_fHeelOffset;
+
+                list l = llGetVisualParams(g_kWearer, ["heel_height", "platform_height"]);
+                fHover += ((llList2Float(l, 0) + llList2Float(l, 1)) / 100.0);
                 llMessageLinked(LINK_RLV, RLV_CMD, "adjustheight:1;0;"+(string)fHover+"=force", g_kWearer);
             }
             StartAnim(llList2String(g_lAnims,0));

src/device/oc_auth.lsl

@@ -20,10 +20,11 @@
 // Debug(string sStr) { llOwnerSay("Debug ["+llGetScriptName()+"]: " + sStr); }
 
 string g_sWearerID;
-list g_lOwner; // 2 max
-list g_lTrust; // 4 max
-list g_lBlock; // 8 per prim with name 'blocklist'
-list g_lTempOwner; // 1 max
+list g_lOwner;
+list g_lTrust;
+list g_lBlock;
+list g_lTempOwner;
+integer g_iMaxUsers = 45;
 
 key g_kGroup = NULL_KEY;
 integer g_iGroupEnabled;
@@ -74,9 +75,6 @@ list g_lMenuIDs;
 integer g_iMenuStride = 3;
 
 integer g_iFirstRun;
-integer g_iIsLED;
-
-list g_lBlocklistPrims; // list of links with name 'blocklist'
 
 string g_sSettingToken = "auth_";
 
@@ -101,12 +99,11 @@ Dialog(string sID, string sPrompt, list lChoices, list lUtilityButtons, integer
 
 AuthMenu(key kAv, integer iAuth)
 {
-    string sPrompt = "\nAccess & Authorization\n\n";
+    string sPrompt = "\nAccess & Authorization";
+    integer iPercentage = llRound(((float)llGetListLength(g_lOwner+g_lTrust+g_lBlock)/(float)g_iMaxUsers)*100.0);
+    sPrompt += "\n\nYou are using "+(string)iPercentage+"% of your global access list storage.";
     list lButtons;
-    if (llGetListLength(g_lBlocklistPrims) > 0)
-        lButtons = ["+ Owner", "+ Trust", "+ Block", "− Owner", "− Trust", "− Block"];
-    else
-        lButtons = ["+ Owner", "+ Trust", "− Owner", "− Trust"];
+    lButtons += ["+ Owner", "+ Trust", "+ Block", "− Owner", "− Trust", "− Block"];
     if (g_kGroup==NULL_KEY) lButtons += ["Group ☐"];
     else lButtons += ["Group ☑"];
     if (g_iOpenAccess) lButtons += ["Public ☑"];
@@ -171,8 +168,6 @@ RemovePerson(string sPersonID, string sToken, key kCmdr, integer iPromoted)
         else if (sToken == "tempowner") g_lTempOwner = lPeople;
         else if (sToken == "trust") g_lTrust = lPeople;
         else if (sToken == "block") g_lBlock = lPeople;
-        if (sToken == "block") SaveBlocklist();
-        else SaveAuthorized();
     } else
         llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"\""+NameURI(sPersonID) + "\" is not in "+sToken+" list.", kCmdr);
 }
@@ -183,17 +178,12 @@ AddUniquePerson(string sPersonID, string sToken, key kID)
     if (llListFindList(g_lTempOwner,[(string)kID]) != -1 && llListFindList(g_lOwner,[(string)kID]) == -1 && sToken != "tempowner")
         llMessageLinked(LINK_DIALOG,NOTIFY, "0"+"%NOACCESS%", kID);
     else {
-        if (sToken == "owner") {
-            if (llGetListLength(g_lOwner) >= 2) {
-                llMessageLinked(LINK_DIALOG,NOTIFY,"0"+"\n\nThe maximum of 2 owners has already been reached\n", kID);
-                return;
-            } else lPeople = g_lOwner;
-        }
+        if (llGetListLength(g_lOwner+g_lTrust+g_lBlock) >= g_iMaxUsers) {
+            llMessageLinked(LINK_DIALOG,NOTIFY,"0"+"\n\nSorry, we have reached a limit!\n\nYou now have 60 people on your combined global access lists. This means in order to add anyone else to a list, you will have to remove someone from either the Owner, Trust, or Block list.\n",kID);
+            return;
+        } else if (sToken == "owner") lPeople = g_lOwner;
         else if (sToken=="trust") {
-            if (llGetListLength(g_lTrust) >= 4) {
-                llMessageLinked(LINK_DIALOG,NOTIFY, "0"+"\n\nThe maximum of 4 trusted people has already been reached\n", kID);
-                return;
-            } else lPeople = g_lTrust;
+            lPeople = g_lTrust;
             if (llListFindList(g_lOwner,[sPersonID]) != -1) {
                 llMessageLinked(LINK_DIALOG,NOTIFY, "0"+"\n\nOops!\n\n"+NameURI(sPersonID)+" is already Owner! You should really trust them.\n", kID);
                 return;
@@ -248,8 +238,6 @@ AddUniquePerson(string sPersonID, string sToken, key kID)
         } else if (sToken == "trust") g_lTrust = lPeople;
         else if (sToken == "tempowner") g_lTempOwner = lPeople;
         else if (sToken == "block") g_lBlock = lPeople;
-        if (sToken == "block") SaveBlocklist();
-        else SaveAuthorized();
     }
 }
 
@@ -266,170 +254,24 @@ SayOwners()
             else sMsg += ".";
         } else if (iCount == 2 && g_iVanilla == FALSE)
             sMsg +=  NameURI(llList2String(g_lOwner,0)) + " and " + NameURI(llList2Key(g_lOwner,1)) + ".";
-        if (sMsg == "You belong to ") sMsg += "yourself."; 
-        llMessageLinked(LINK_DIALOG,NOTIFY, "0"+sMsg, g_sWearerID);
-    }
-}
-
-SaveAuthorized()
-{
-    // face layout: g_lOwner[0], g_lOwner[1], g_lTempOwner[0], g_kGroup, g_lTrust[0], g_lTrust[1], g_lTrust[2], g_lTrust[3]
-    string TEXTURE_NOTHING = TEXTURE_BLANK;
-    float fLimitRange = (float)g_iLimitRange;
-    float fRunawayDisable = (float) g_iRunawayDisable;
-    float fVanilla = (float)g_iVanilla;
-    float fHardVanilla = (float)g_iHardVanilla;
-    string sFirstOwner = TEXTURE_NOTHING;
-    string sSecondOwner = TEXTURE_NOTHING;
-    integer iFace;
-    if (llGetListLength(g_lOwner) == 1) {
-        sFirstOwner = llList2String(g_lOwner, 0);
-    } else if (llGetListLength(g_lOwner) > 1) {
-        sFirstOwner = llList2String(g_lOwner, 0);
-        sSecondOwner = llList2String(g_lOwner, 1);
-    }
-    llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 0, sFirstOwner, <1,1,0>, <fLimitRange,fRunawayDisable,0>, 0]);
-    llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 1, sSecondOwner, <1,1,0>, <fVanilla,fHardVanilla,0>, 0]);
-
-    float fOpenAccess = (float)g_iOpenAccess;
-    if (llGetListLength(g_lTempOwner) > 0) {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 2, llList2String(g_lTempOwner, 0), <fOpenAccess,1,0>, <0,0,0>, 0]);
-    } else {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 2, TEXTURE_NOTHING, <1,1,0>, <fOpenAccess,0,0>, 0]);
-    }
-
-    string sGroup = TEXTURE_NOTHING;
-    if (g_kGroup != NULL_KEY) sGroup = (string)g_kGroup;
-    if (g_iGroupEnabled) {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 3, sGroup, <1,1,0>, <1,1,0>, 0]);
-    } else {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, 3, TEXTURE_NOTHING, <1,1,0>, <0,0,0>, 0]);
-    }
-
-    for (iFace = 4; iFace < llGetNumberOfPrims(); iFace++) {
-        if (llGetListLength(g_lTrust) > (iFace-4)) {
-            llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, iFace, llList2String(g_lTrust, (iFace-4)), <1,1,0>, <0,0,0>, 0]);
-        } else {
-            llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_TEXTURE, iFace, TEXTURE_NOTHING, <1,1,0>, <0,0,0>, 0]);
-        }
-    }
-
-}
-
-LoadAuthorized()
-{
-    // face layout: g_lOwner[0], g_lOwner[1], g_lTempOwner[0], g_kGroup, g_lTrust[0], g_lTrust[1], g_lTrust[2], g_lTrust[3]
-    // Note that Linden Lab disabled the ability to get the texture key using PRIM_TEXTURE if you don't own the texture,
-    // which we don't (since they're just keys). So in SL it would then return NULL_KEY, however OpenSim is not that idiotic.
-    list l;
-    vector v;
-    list lExclude = ["", TEXTURE_BLANK, TEXTURE_PLYWOOD, TEXTURE_TRANSPARENT];
-
-    g_lOwner = [];
-    l = llGetLinkPrimitiveParams(LINK_THIS, [PRIM_TEXTURE, 0]);
-    if (llListFindList(lExclude, [llList2Key(l, 0)]) == -1) g_lOwner += [llList2Key(l, 0)];
-    v = llList2Vector(l, 2);
-    g_iLimitRange = (integer)v.x;
-    g_iRunawayDisable = (integer)v.y;
-
-    l = llGetLinkPrimitiveParams(LINK_THIS, [PRIM_TEXTURE, 1]);
-    if (llListFindList(lExclude, [llList2Key(l, 0)]) == -1) g_lOwner += [llList2Key(l, 0)];
-    v = llList2Vector(l, 2);
-    g_iVanilla = (integer)v.x;
-    g_iHardVanilla = (integer)v.y;
-
-    if (llGetListLength(g_lOwner)) {
-        llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "owner=" + llDumpList2String(g_lOwner, ","), "");
-        llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "owner=" + llDumpList2String(g_lOwner, ","), "");
-    } else
-        llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "owner", "");
-
-    g_lTempOwner = [];
-    l = llGetLinkPrimitiveParams(LINK_THIS, [PRIM_TEXTURE, 2]);
-    if (llListFindList(lExclude, [llList2Key(l, 0)]) == -1) g_lTempOwner += [llList2Key(l, 0)];
-    v = llList2Vector(l, 2);
-    g_iOpenAccess = (integer)v.x;
-    if (llGetListLength(g_lTempOwner)) {
-        llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "tempowner="+llList2Key(g_lTempOwner, 0), "");
-        llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "tempowner="+llList2Key(g_lTempOwner, 0), "");
-    } else
-        llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "tempowner", "");
-
-    l = llGetLinkPrimitiveParams(LINK_THIS, [PRIM_TEXTURE, 3]);
-    if (llListFindList(lExclude, [llList2Key(l, 0)]) == -1) g_kGroup = llList2Key(l, 0);
-    else g_kGroup = NULL_KEY;
-    v = llList2Vector(l, 2);
-    if (g_kGroup != NULL_KEY && v.x > 0) {
-        if (llList2Key(llGetObjectDetails(llGetKey(), [OBJECT_GROUP]), 0) == g_kGroup) g_iGroupEnabled = TRUE;
-        else g_iGroupEnabled = FALSE;
-    } else g_iGroupEnabled = FALSE;
-    if (g_kGroup != NULL_KEY) {
-        llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "group="+(string)g_kGroup, "");
-        llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "group="+(string)g_kGroup, "");
-    } else
-        llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "group", "");
-
-    g_lTrust = [];
-    integer iFace;
-    for (iFace = 4; iFace < 8; iFace++) {
-        l = llGetLinkPrimitiveParams(LINK_THIS, [PRIM_TEXTURE, iFace]);
-        if (llListFindList(lExclude, [llList2Key(l, 0)]) == -1) g_lTrust += [llList2Key(l, 0)];
-    }
-    if (llGetListLength(g_lTrust)) {
-        llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "trust=" + llDumpList2String(g_lTrust, ","), "");
-        llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "trust=" + llDumpList2String(g_lTrust, ","), "");
-    } else
-        llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "trust" + llDumpList2String(g_lTrust, ","), "");
-}
-
-LoadBlocklist()
-{
-    if (llGetListLength(g_lBlocklistPrims) == 0) return;
-    list lExclude = ["", TEXTURE_BLANK, TEXTURE_PLYWOOD, TEXTURE_TRANSPARENT];
-
-    g_lBlock = [];
-    integer iPrim;
-    for (iPrim = 0; iPrim < llGetListLength(g_lBlocklistPrims); iPrim++) {
-        integer iFace;
-        integer iLink = llList2Integer(g_lBlocklistPrims, iPrim);
-        for (iFace = 0; iFace < 8; iFace++) {
-            list lParams = llGetLinkPrimitiveParams(iLink, [PRIM_TEXTURE, iFace]);
-            string sTexture = llList2String(lParams, 0);
-            if (llListFindList(lExclude, [sTexture]) == -1) g_lBlock += [(key)sTexture];
-        }
-    }
-}
-
-GatherBlocklistPrims()
-{
-    g_lBlocklistPrims = [];
-    integer i;
-    for (i = LINK_ROOT; i < llGetNumberOfPrims()+1; i++) {
-        if (llGetLinkName(i) == "blocklist") g_lBlocklistPrims += [i];
-    }
-}
-
-SaveBlocklist()
-{
-    if (llGetListLength(g_lBlocklistPrims) == 0) return;
-    integer iPrim;
-    for (iPrim = 0; iPrim < llGetListLength(g_lBlocklistPrims); iPrim++) {
-        integer iFace;
-        integer iLink = llList2Integer(g_lBlocklistPrims, iPrim);
-        for (iFace = 0; iFace < 8; iFace++) {
-            integer idx = (iPrim*8) + iFace;
-            if (llGetListLength(g_lBlock)-1 < idx) {
-                // no more people, pad with TEXTURE_BLANK
-                llSetLinkPrimitiveParamsFast(iLink, [
-                    PRIM_TEXTURE, iFace, TEXTURE_BLANK, <1,1,0>, <0,0,0>, 0,
-                    PRIM_COLOR, <1,1,1>, 0.0]);
+        else if (iCount) {
+            integer iMax = 9;
+            if (g_iVanilla) iMax = 8;
+            while (index < iCount-1 && index < iMax) {
+                sMsg += NameURI(llList2String(g_lOwner,index))+", ";
+                index+=1;
+            }
+            if (iCount > (iMax+1)) {
+                sMsg += NameURI(llList2String(g_lOwner,index));
+                if (g_iVanilla) sMsg += ", yourself";
+                sMsg += " and others.";
             } else {
-                // use blocked person's key as texture
-                llSetLinkPrimitiveParamsFast(iLink, [
-                    PRIM_TEXTURE, iFace, llList2String(g_lBlock, idx), <1,1,0>, <0,0,0>, 0,
-                    PRIM_COLOR, <1,1,1>, 0.0]);
+                if (g_iVanilla) sMsg += NameURI(llList2String(g_lOwner,index))+" and yourself.";
+                else sMsg += "and "+NameURI(llList2String(g_lOwner,index))+".";
             }
         }
+        if (sMsg == "You belong to ") sMsg += "yourself."; 
+        llMessageLinked(LINK_DIALOG,NOTIFY, "0"+sMsg, g_sWearerID);
     }
 }
 
@@ -554,7 +396,6 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
                 if (g_iVanilla) sStr = "enabled.";
                 llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Vanilla is currently "+sStr, kID);
             }
-            SaveAuthorized();
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
         @next;
         if (iRemenu) AuthMenu(kID, iAuth);
@@ -568,7 +409,7 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
         if (iAuth!=CMD_OWNER && !(sAction == "trust" && kID == g_sWearerID)) {
             llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
             if (iRemenu) AuthMenu(kID, Auth(kID));
-        } else if (osIsUUID(sTmpID)){
+        } else if ((key)sTmpID){
             AddUniquePerson(sTmpID, sAction, kID);
             if (iRemenu) Dialog(kID, "\nChoose who to add to the "+sAction+" list:\n", [sTmpID], [UPMENU], 0, Auth(kID),"AddAvi"+sAction, TRUE);
         } else {
@@ -582,7 +423,7 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
         if (iAuth != CMD_OWNER && !( sAction == "trust" && kID == g_sWearerID )) {
             llMessageLinked(LINK_DIALOG,NOTIFY,"0"+"%NOACCESS%",kID);
             if (iRemenu) AuthMenu(kID, Auth(kID));
-        } else if (osIsUUID(sTmpID)) {
+        } else if ((key)sTmpID) {
             RemovePerson(sTmpID, sAction, kID, FALSE);
             if (iRemenu) RemPersonMenu(kID, sAction, Auth(kID));
         } else if (llToLower(sTmpID) == "remove all") {
@@ -592,7 +433,7 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
      } else if (sCommand == "group") {
          if (iAuth==CMD_OWNER){
              if (sAction == "on") {
-                if (osIsUUID(llList2String(lParams, -1))) g_kGroup = llList2Key(lParams, -1);
+                if ((key)llList2String(lParams, -1)) g_kGroup = llList2Key(lParams, -1);
                 else g_kGroup = llList2Key(llGetObjectDetails(llGetKey(), [OBJECT_GROUP]), 0);
                 if (g_kGroup != NULL_KEY) {
                     llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "group=" + (string)g_kGroup, "");
@@ -607,7 +448,6 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
                 llMessageLinked(LINK_DIALOG,NOTIFY, "1"+"Group unset.", kID);
                 llMessageLinked(LINK_RLV, RLV_CMD, "setgroup=y", "auth");
             }
-            SaveAuthorized();
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
         if (iRemenu) AuthMenu(kID, Auth(kID));
     } else if (sCommand == "public") {
@@ -621,7 +461,6 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
                 llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "public", "");
                 llMessageLinked(LINK_DIALOG, NOTIFY, "1"+"The %DEVICETYPE% is closed to the public.", kID);
             }
-            SaveAuthorized();
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
         if (iRemenu) AuthMenu(kID, Auth(kID));
     } else if (sCommand == "limitrange") {
@@ -635,7 +474,6 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
                 llMessageLinked(LINK_SAVE, LM_SETTING_SAVE, g_sSettingToken + "limitrange=" + (string) g_iLimitRange, "");
                 llMessageLinked(LINK_DIALOG, NOTIFY, "1"+"Public access range is simwide.", kID);
             }
-            SaveAuthorized();
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
         if (iRemenu) AuthMenu(kID, Auth(kID));
     } else if (sMessage == "runaway"){
@@ -662,7 +500,6 @@ UserCommand(integer iAuth, string sStr, key kID, integer iRemenu)
 RunAway()
 {
     llMessageLinked(LINK_DIALOG, NOTIFY_OWNERS, "%WEARERNAME% ran away!", "");
-    g_lOwner = [];
     llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "owner=", "");
     llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "owner", "");
     llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "vanilla", "");
@@ -672,9 +509,7 @@ RunAway()
     g_lTempOwner = [];
     llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, g_sSettingToken + "tempowner=", "");
     llMessageLinked(LINK_SAVE, LM_SETTING_DELETE, g_sSettingToken + "tempowner", "");
-    SaveAuthorized();
     g_lBlock = [];
-    SaveBlocklist();
     llMessageLinked(LINK_ALL_OTHERS, CMD_OWNER, "clear", g_sWearerID);
     llMessageLinked(LINK_ALL_OTHERS, CMD_OWNER, "runaway", g_sWearerID);
     llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Runaway finished.", g_sWearerID);
@@ -712,21 +547,13 @@ default
         if (llGetStartParameter()==825) llSetRemoteScriptAccessPin(0);
         else g_iFirstRun = TRUE;
         g_sWearerID = llGetOwner();
-        if (llSubStringIndex(llGetObjectDesc(),"LED") == 0) g_iIsLED = TRUE;
-        LoadAuthorized();
-        GatherBlocklistPrims();
-        LoadBlocklist();
         llMessageLinked(LINK_ALL_OTHERS,LINK_UPDATE,"LINK_REQUEST","");
-        if (g_iIsLED == FALSE) PieSlice();
+        PieSlice();
     }
 
     link_message(integer iSender, integer iNum, string sStr, key kID)
     {
         if (iNum == CMD_ZERO) {
-            if (g_iIsLED) {
-                llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, TRUE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_NONE, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.4]);
-                llSetTimerEvent(0.5);
-            }
             integer iAuth = Auth(kID);
             if (kID == g_sWearerID && sStr == "runaway") {
                 if (g_iRunawayDisable)
@@ -749,7 +576,7 @@ default
                 if (sToken == "owner")
                     g_lOwner = llParseString2List(sValue, [","], []);
                 else if (sToken == "tempowner") {
-                    if (osIsUUID(sValue)) g_lTempOwner = [sValue];
+                    if ((key)sValue) g_lTempOwner = [sValue];
                     else g_lTempOwner = [];
                 } else if (sToken == "vanilla") g_iVanilla = (integer)sValue;
                 else if (sToken == "group") {
@@ -768,25 +595,15 @@ default
                 else if (sToken == "hardvanilla") g_iHardVanilla = (integer)sValue;
             } else if (sStr == "settings=sent") {
                 if (g_iFirstRun) {
-                    LoadAuthorized();
-                    LoadBlocklist();
                     SayOwners();
                     g_iFirstRun = FALSE;
                 }
             }
         } else if (iNum == AUTH_REQUEST) {
-            if (g_iIsLED) {
-                llSetLinkPrimitiveParamsFast(LINK_THIS,[PRIM_FULLBRIGHT, ALL_SIDES, TRUE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_NONE, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.4]);
-                llSetTimerEvent(0.5);
-            }
             llMessageLinked(iSender, AUTH_REPLY, "AuthReply|"+(string)kID+"|"+(string)Auth(kID), llGetSubString(sStr,0,35));
         } else if (iNum == DIALOG_RESPONSE) {
             integer iMenuIndex = llListFindList(g_lMenuIDs, [kID]);
             if (iMenuIndex != -1) {
-                if (g_iIsLED) {
-                    llSetLinkPrimitiveParamsFast(LINK_THIS,[PRIM_FULLBRIGHT, ALL_SIDES, TRUE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_NONE, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.4]);
-                    llSetTimerEvent(0.5);
-                }
                 list lMenuParams = llParseString2List(sStr, ["|"], []);
                 key kAv = llList2Key(lMenuParams, 0);
                 string sMessage = llList2String(lMenuParams, 1);
@@ -828,7 +645,7 @@ default
                     else if (sMessage == UPMENU) AuthMenu(kAv, iAuth);
                     else if (sMessage == "No") llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Runaway aborted.", kAv);
                 } if (llSubStringIndex(sMenu,"AddAvi") == 0) {
-                    if (osIsUUID(sMessage)) {
+                    if ((key)sMessage) {
                         AddUniquePerson(sMessage, llGetSubString(sMenu,6,-1), kAv);
                         AuthMenu(kAv,iAuth);
                     } else if (sMessage == "BACK")
@@ -850,19 +667,5 @@ default
         } else if (iNum == REBOOT && sStr == "reboot") llResetScript();
     }
 
-    timer ()
-    {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, FALSE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_HIGH, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.0]);
-        llSetTimerEvent(0.0);
-    }
-
-    changed(integer iChange)
-    {
-        if (iChange & CHANGED_LINK) {
-            LoadAuthorized();
-            GatherBlocklistPrims();
-            LoadBlocklist();
-        }
-    }
 }
 

src/device/oc_dialog.lsl

@@ -78,8 +78,6 @@ list g_lColors = [
 "Midnight",<0.00000, 0.10588, 0.21176>
 ];
 
-integer g_iIsLED;
-
 string NameURI(key kID)
 {
     return "secondlife:///app/agent/"+(string)kID+"/about";
@@ -89,13 +87,13 @@ string SubstitudeVars(string sMsg)
 {
         if (sMsg == "%NOACCESS%") return "Access denied.";
         if (llSubStringIndex(sMsg, "%PREFIX%") != -1)
-            sMsg = osReplaceString(sMsg, "%PREFIX%", g_sPrefix, -1, 0);
+            sMsg = llReplaceSubString(sMsg, "%PREFIX%", g_sPrefix, 0);
         if (llSubStringIndex(sMsg, "%CHANNEL%") != -1)
-            sMsg = osReplaceString(sMsg, "%CHANNEL%", (string)g_iListenChan, -1, 0);
+            sMsg = llReplaceSubString(sMsg, "%CHANNEL%", (string)g_iListenChan, 0);
         if (llSubStringIndex(sMsg, "%DEVICETYPE%") != -1)
-            sMsg = osReplaceString(sMsg, "%DEVICETYPE%", g_sDeviceType, -1, 0);
+            sMsg = llReplaceSubString(sMsg, "%DEVICETYPE%", g_sDeviceType, 0);
         if (llSubStringIndex(sMsg, "%WEARERNAME%") != -1)
-            sMsg = osReplaceString(sMsg, "%WEARERNAME%", g_sWearerName, -1, 0);
+            sMsg = llReplaceSubString(sMsg, "%WEARERNAME%", g_sWearerName, 0);
         return sMsg;
 }
 
@@ -179,7 +177,7 @@ Dialog(key kRecipient, string sPrompt, list lMenuItems, list lUtilityButtons, in
         sNumberedButtons="\n";
         for (iCur = iStart; iCur <= iEnd; iCur++) {
             string sButton = llList2String(lMenuItems, iCur);
-            if (osIsUUID(sButton)) {
+            if ((key)sButton) {
                 if (g_iSelectAviMenu) sButton = NameURI((key)sButton);
                 else if (llGetDisplayName((key)sButton)) sButton = llGetDisplayName((key)sButton);
                 else sButton = llKey2Name((key)sButton);
@@ -225,14 +223,12 @@ Dialog(key kRecipient, string sPrompt, list lMenuItems, list lUtilityButtons, in
     integer iChan = llRound(llFrand(10000000)) + 100000;
     while (llListFindList(g_lMenus, [iChan]) != -1) iChan=llRound(llFrand(10000000)) + 100000;
     integer iListener = llListen(iChan, "", kRecipient, "");
-    if (g_iIsLED) llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, TRUE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_NONE, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.4]);
     if (llGetListLength(lMenuItems+lUtilityButtons) > 0){
         list lNavButtons;
         if (iNumitems > iMyPageSize) lNavButtons=["◄","►"];
         llDialog(kRecipient, sThisPrompt, PrettyButtons(lButtons, lUtilityButtons, lNavButtons), iChan);
     }
     else llTextBox(kRecipient, sThisPrompt, iChan);
-    if (g_iIsLED) llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, FALSE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_HIGH, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.0]);
     llSetTimerEvent(g_iReapeat);
     integer ts = llGetUnixTime() + g_iTimeOut;
     g_lMenus += [iChan, kID, iListener, ts, kRecipient, sPrompt, llDumpList2String(lMenuItems, "|"), llDumpList2String(lUtilityButtons, "|"), iPage, iWithNums, iAuth,extraInfo];
@@ -360,10 +356,9 @@ default
     {
         if (llGetStartParameter() == 825) llSetRemoteScriptAccessPin(0);
         g_kWearer = llGetOwner();
-        if (llSubStringIndex(llGetObjectDesc(),"LED") == 0) g_iIsLED = TRUE;
         g_sPrefix = llToLower(llGetSubString(llKey2Name(g_kWearer),0,1));
         g_sWearerName = NameURI(g_kWearer);
-        if (g_iIsLED == FALSE) PieSlice();
+        PieSlice();
         llSetLinkPrimitiveParamsFast(LINK_THIS,[PRIM_NAME,g_sDeviceName]);
     }
 

src/device/oc_exceptions.lsl

@@ -293,7 +293,7 @@ UserCommand(integer iNum, string sStr, key kID) {
     for (iL = 0; iL < iInd; iL += 2) {
         sWho = llList2String(lParts, iL);
         string sWhoName;
-        if (osIsUUID(sWho)) sWhoName = "secondlife:///app/agent/"+sWho+"/about";
+        if ((key)sWho) sWhoName = "secondlife:///app/agent/"+sWho+"/about";
         else sWhoName = sWho;
         sLower = llToLower(sWho);
         if (llListFindList(g_lOwners, [sWho]) != -1) {

src/device/oc_leash.lsl

@@ -429,7 +429,7 @@ UserCommand(integer iAuth, string sMessage, key kMessageID, integer bFromMenu) {
             else if (sVal == "me") {
                 g_iPassConfirmed = TRUE;
                 LeashTo(kMessageID, kMessageID, iAuth, [], TRUE);
-            } else if (osIsUUID(sVal)) {
+            } else if ((key)sVal) {
                 g_iPassConfirmed = TRUE;
                 LeashTo((key)sVal, kMessageID, iAuth, [], TRUE);
             } else
@@ -506,7 +506,7 @@ UserCommand(integer iAuth, string sMessage, key kMessageID, integer bFromMenu) {
             if (CheckCommandAuth(kMessageID, iAuth) == FALSE) return;
             if (sVal==llToLower(BUTTON_UPMENU))
                 UserCommand(iAuth, "leashmenu", kMessageID, bFromMenu);
-            else if(osIsUUID(sVal)) {
+            else if((key)sVal) {
                 list lPoints;
                 if (llGetListLength(lParam) > 2) lPoints = llList2List(lParam, 2, -1);
                 LeashTo((key)sVal, kMessageID, iAuth, lPoints, FALSE);
@@ -533,7 +533,7 @@ UserCommand(integer iAuth, string sMessage, key kMessageID, integer bFromMenu) {
                 if (bFromMenu) UserCommand(iAuth, "post", kMessageID, bFromMenu);
             }
             if (sVal == llToLower(BUTTON_UPMENU)) UserCommand(iAuth, "menu leash", kMessageID ,bFromMenu);
-            else if(osIsUUID(sVal)) {
+            else if((key)sVal) {
                 list lPoints;
                 if (llGetListLength(lParam) > 2) lPoints = llList2List(lParam, 2, -1);
                 if (llGetAgentSize((key)sVal) != ZERO_VECTOR) g_iPassConfirmed = FALSE;
@@ -550,13 +550,11 @@ default
     on_rez(integer start_param)
     {
         if (llGetOwner() != g_kWearer) llResetScript();
-        g_vRegionSize = osGetRegionSize();
         DoUnleash(FALSE);
     }
 
     state_entry() {
         g_kWearer = llGetOwner();
-        g_vRegionSize = osGetRegionSize();
         DoUnleash(FALSE);
         FindLeashHolder();
     }
@@ -762,7 +760,6 @@ default
     changed (integer iChange)
     {
         if (iChange & CHANGED_OWNER) g_kWearer = llGetOwner();
-        if (iChange & CHANGED_REGION) g_vRegionSize = osGetRegionSize();
         if (iChange & CHANGED_INVENTORY) FindLeashHolder();
     }
 }

src/device/oc_pet.lsl

@@ -379,8 +379,8 @@ default
         llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"If you would like to stop the animation early, say /" + (string)g_iStopChan + g_sStopString + " to stop.", g_kPartner);
         string sText = llList2String(g_lAnimSettings, g_iCmdIndex * 4 + 3);
         if (sText != "" && g_iVerbose) {
-            sText = osReplaceString(sText, "_PARTNER_", g_sPartnerName, -1, 0);
-            sText = osReplaceString(sText, "_SELF_", "%WEARERNAME%", -1, 0);
+            sText = llReplaceSubString(sText, "_PARTNER_", g_sPartnerName, 0);
+            sText = llReplaceSubString(sText, "_SELF_", "%WEARERNAME%", 0);
             llMessageLinked(LINK_DIALOG, SAY, "0"+sText, "");
         }
         if (g_fTimeOut > 0.0) {

src/device/oc_relay.lsl

@@ -112,7 +112,7 @@ Dialog(key kID, string sPrompt, list lChoices, list lUtilityButtons, integer iPa
 
 key SanitizeKey(string uuid)
 {
-    if (osIsUUID(uuid)) return llToLower(uuid);
+    if ((key)uuid) return llToLower(uuid);
     return NULL_KEY;
 }
 
@@ -157,7 +157,7 @@ integer Auth(string sObjectID, string sUserID)
     else if (g_sTempTrustObj == sObjectID) {}
     else if (llListFindList(g_lOwner+g_lTrust+[g_sTempOwner],[sOwner]) != -1) {}
     else iAuth = 0;
-    if (osIsUUID(sUserID)) {
+    if ((key)sUserID) {
         if (llListFindList(g_lBlock+g_lBlockAv,[sUserID]) != -1) return -1;
         else if (g_iBaseMode == 3) {}
         else if (g_sTempTrustUser == sUserID) {}

src/device/oc_rlvsuite.lsl

@@ -203,7 +203,7 @@ WearFolder(string sStr, key kID)
     if (g_sCoreFolder != "") llOwnerSay("@detachallthis:"+g_sCoreFolder+"=n");
     // unwear everything that's not locked:
     llOwnerSay("@remoutfit=force,detach=force");
-    // wear clothes/parts from the core folder that are not already worn:
+    // ensure everything from core folder is worn:
     if (g_sCoreFolder != "") llOwnerSay("@attachallover:"+g_sCoreFolder+"=force");
     // wear the chosen outfit:
     llOwnerSay("@attachallover:"+sStr+"=force");
@@ -211,7 +211,6 @@ WearFolder(string sStr, key kID)
     if (g_sCoreFolder != "") llOwnerSay("@detachallthis:"+g_sCoreFolder+"=y");
     // cleanup: unlock the collar, only if it was locked temporarily
     if (g_iLocked == FALSE) llOwnerSay("@detach=y");
-    llSleep(1.5); // delay for SSA
 }
 
 doRestrictions()
@@ -506,7 +505,7 @@ UserCommand(integer iNum, string sStr, key kID, integer bFromMenu)
     } else if (llSubStringIndex(sLowerStr,"sit ") == 0) {
         if (iNum <= g_iStandRestricted || g_iStandRestricted == FALSE) {
             sLowerStr = llDeleteSubString(sStr,0,llStringLength("sit ")-1);
-            if (osIsUUID(sLowerStr)) {
+            if ((key)sLowerStr) {
                 llMessageLinked(LINK_RLV, RLV_CMD, "unsit=y,unsit=force", "vdRestrict");
                 llSleep(0.5);
                 g_kLastForcedSeat=(key)sLowerStr;
@@ -565,6 +564,7 @@ default
             else if (sStr=="restrictions_blurred") g_iBlurredRestricted=FALSE;
             else if (sStr=="restrictions_dazed")   g_iDazedRestricted=FALSE;
             else if (sStr=="restrictions_dress") g_iDressRestricted=FALSE;
+            doRestrictions();
         } else if (iNum == LM_SETTING_RESPONSE) {
             list lParams = llParseString2List(sStr, ["="], []);
             string sToken = llList2String(lParams, 0);
@@ -581,6 +581,7 @@ default
                 else if (sToken=="restrictions_blurred")  g_iBlurredRestricted=(integer)sValue;
                 else if (sToken=="restrictions_dazed")    g_iDazedRestricted=(integer)sValue;
                 else if (sToken=="restrictions_dress")    g_iDressRestricted=(integer)sValue;
+                doRestrictions();
             } else if (sToken==g_sSettingToken+"corefolder") {
                 if (sValue=="none") g_sCoreFolder = "";
                 else g_sCoreFolder = sValue;
@@ -677,4 +678,4 @@ default
         llListenRemove(g_iListener);
         llSetTimerEvent(0.0);
     }
-}
+}

src/device/oc_rlvsys.lsl

@@ -73,8 +73,6 @@ integer RLV_OFF = 6100;
 integer RLV_ON = 6101;
 integer RLV_QUERY = 6102;
 integer RLV_RESPONSE = 6103;
-integer RLV_SHOES = 6108;
-integer RLV_NOSHOES = 6109;
 
 integer DIALOG = -9000;
 integer DIALOG_RESPONSE = -9001;
@@ -101,14 +99,8 @@ list g_lBaked;
 key g_kSitter = NULL_KEY;
 key g_kSitTarget = NULL_KEY;
 
-integer g_iShoeNotify = TRUE;
-integer g_iShoeListener;
-integer g_iShoeChannel;
-integer g_iShoesWorn = FALSE;
-
 integer CMD_ADDSRC = 11;
 integer CMD_REMSRC = 12;
-integer g_iIsLED;
 
 DoMenu(key kID, integer iAuth)
 {
@@ -350,33 +342,19 @@ default
     on_rez(integer param)
     {
         if (g_kWearer != llGetOwner()) llResetScript();
-        if (llSubStringIndex(llGetObjectDesc(),"LED") == 0) g_iIsLED = TRUE;
         g_iRlvActive = FALSE;
         g_iViewerCheck = FALSE;
         g_iRLVOn = FALSE;
         g_lBaked = [];
         llMessageLinked(LINK_ALL_OTHERS,LINK_UPDATE,"LINK_RLV","");
-        if (g_iIsLED == FALSE) PieSlice();
+        PieSlice();
     }
 
     state_entry()
     {
         if (llGetStartParameter()==825) llSetRemoteScriptAccessPin(0);
-        llOwnerSay("@clear");
         g_kWearer = llGetOwner();
-        if (llSubStringIndex(llGetObjectDesc(),"LED") == 0) g_iIsLED = TRUE;
-        if (g_iIsLED == FALSE) PieSlice();
-    }
-
-    attach(key kID)
-    {
-        if (kID == NULL_KEY && g_iRLVOn) {
-            // Detach, so de-register worn and unworn events (if it gets through)
-            if (g_iRlvActive) {
-                llOwnerSay("@notify:"+(string)g_iShoeChannel+";worn legally shoes=rem");
-                llOwnerSay("@notify:"+(string)g_iShoeChannel+";unworn legally shoes=rem");
-            }
-        }
+        PieSlice();
     }
 
     listen(integer iChan, string sName, key kID, string sMsg)
@@ -398,29 +376,6 @@ default
             g_iRlvaVersion = (llList2Integer(lVersionSplit,0) * 100) + llList2Integer(lVersionSplit, 1);
             setRlvState();
             return;
-        } else if (iChan == g_iShoeChannel) {
-            //if (llGetSubString(sMsg, 0, 6) == "/notify") {
-            //    llOwnerSay("shoe channel: got notify result: "+sMsg);
-            //} else
-            if (sMsg  == "/unworn legally shoes") {
-                g_iShoesWorn = FALSE;
-                llMessageLinked(LINK_ANIM, RLV_NOSHOES, "", "");
-            } else if (sMsg == "/worn legally shoes") {
-                g_iShoesWorn = TRUE;
-                llMessageLinked(LINK_ANIM, RLV_SHOES, "", "");
-            } else if (llGetSubString(sMsg, 0, 6) != "/notify") {
-                // @getoutfit result (a string of 1's and 0's)
-                string sFlagShoes = llGetSubString(sMsg, 4, 4);
-                if (sFlagShoes == "1" || sFlagShoes == "0")
-                {
-                    g_iShoesWorn = (integer)llGetSubString(sMsg, 4, 4);
-                    if (g_iShoesWorn) llMessageLinked(LINK_ANIM, RLV_SHOES, "", "");
-                    else llMessageLinked(LINK_ANIM, RLV_NOSHOES, "", "");
-                    // Register to be notified of worn and unworn
-                    llOwnerSay("@notify:"+(string)g_iShoeChannel+";worn legally shoes=add");
-                    llOwnerSay("@notify:"+(string)g_iShoeChannel+";unworn legally shoes=add");
-                }
-            }
         }
     }
 
@@ -435,10 +390,6 @@ default
         else if (iNum == DIALOG_RESPONSE) {
             integer iMenuIndex = llListFindList(g_lMenuIDs, [kID]);
             if (iMenuIndex != -1) {
-                if (g_iIsLED) {
-                    llSetLinkPrimitiveParamsFast(LINK_THIS,[PRIM_FULLBRIGHT,ALL_SIDES,TRUE,PRIM_BUMP_SHINY,ALL_SIDES,PRIM_SHINY_NONE,PRIM_BUMP_NONE,PRIM_GLOW,ALL_SIDES,0.4]);
-                    llSensorRepeat("N0thin9","abc",ACTIVE,0.1,0.1,0.22);
-                }
                 list lMenuParams = llParseString2List(sStr, ["|"], []);
                 key kAv = llList2Key(lMenuParams, 0);
                 string sMsg = llList2String(lMenuParams, 1);
@@ -521,10 +472,6 @@ default
             while (numBaked--)
                 llOwnerSay("@"+llList2String(g_lBaked, numBaked)+"=n");
         } else if (g_iRlvActive) {
-            if (g_iIsLED) {
-                llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, TRUE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_NONE, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.4]);
-                llSensorRepeat("N0thin9", "abc", ACTIVE, 0.1, 0.1, 0.22);
-            }
             if (iNum == RLV_CMD) {
                 list lCommands = llParseString2List(llToLower(sStr), [","], []);
                 while (llGetListLength(lCommands) > 0) {
@@ -584,12 +531,6 @@ default
         }
     }
 
-    no_sensor()
-    {
-        llSetLinkPrimitiveParamsFast(LINK_THIS, [PRIM_FULLBRIGHT, ALL_SIDES, FALSE, PRIM_BUMP_SHINY, ALL_SIDES, PRIM_SHINY_HIGH, PRIM_BUMP_NONE, PRIM_GLOW, ALL_SIDES, 0.0]);
-        llSensorRemove();
-    }
-
     timer()
     {
         if (g_iWaitRelay) {
@@ -610,12 +551,6 @@ default
                     if (kSource != NULL_KEY) llShout(RELAY_CHANNEL, "ping," + (string)kSource + ",ping,ping");
                     else rebakeSourceRestrictions(kSource);
                 }
-                if (g_iShoeNotify) {
-                    g_iShoeChannel = (9999 + llRound(llFrand(9999999.0)));
-                    llListenRemove(g_iShoeListener);
-                    g_iShoeListener = llListen(g_iShoeChannel, "", (string)g_kWearer, "");
-                    llOwnerSay("@getoutfit="+(string)g_iShoeChannel);
-                }
                 if (llGetStartParameter() == 0) llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"RLV ready!", g_kWearer);
             }
         } else {

src/device/oc_settings.lsl

@@ -1,6 +1,4 @@
 
-yoptions;
-
 //  oc_settings.lsl
 //
 //  Copyright (c) 2008 - 2017 Nandana Singh, Cleo Collins, Master Starship,
@@ -93,6 +91,7 @@ integer SettingExists(string sToken)
 
 list SetSetting(list lCache, string sToken, string sValue)
 {
+    llLinksetDataWrite(sToken, sValue);
     integer idx = llListFindList(lCache, [sToken]);
     if (idx != -1) return llListReplaceList(lCache, [sValue], idx+1, idx+1);
     idx = GroupIndex(lCache, sToken);
@@ -108,6 +107,7 @@ string GetSetting(string sToken)
 
 DelSetting(string sToken)
 {
+    llLinksetDataDelete(sToken);
     integer i = llGetListLength(g_lSettings) - 1;
     if (SplitToken(sToken, 1) == "all") {
         sToken = SplitToken(sToken, 0);
@@ -176,7 +176,7 @@ PrintSettings(key kID, string sDebug)
     list lOut;
     string sLinkNr = (string)llGetLinkNumber();
     string sLinkName = llGetLinkName(LINK_THIS);
-    list lSay = ["/me \nTo copy/paste the settings below in the .settings notecard (in the '"+sLinkName+"' prim, link nr. "+sLinkNr+"), make sure the device is unlocked!\n----- 8< ----- 8< ----- 8< -----\n"];
+    list lSay = ["/me \nYou can copy/paste the settings below in a notecard to be loaded as backup (in the '"+sLinkName+"' prim, link nr. "+sLinkNr+")\n----- 8< ----- 8< ----- 8< -----\n"];
     if (sDebug == "debug")
         lSay = ["/me Settings Debug:\n"];
     lSay += Add2OutList(g_lSettings, sDebug);
@@ -200,25 +200,30 @@ PrintSettings(key kID, string sDebug)
     }
 }
 
-SaveSettings(key kID)
+integer SaveCard(key kID)
 {
+    integer iRet = FALSE;
     list lOut = Add2OutList(g_lSettings, "save");
     try
     {
+        if (llGetInventoryType(g_sCard)==INVENTORY_NOTECARD)
+            llRemoveInventory(g_sCard);
         osMakeNotecard(g_sCard, lOut);
         llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Settings saved.", kID);
+        iRet = TRUE;
     }
     catch (scriptexception ex)
     {
         string msg = yExceptionMessage(ex);
-        if (osStringStartsWith(msg, "ossl permission error", TRUE))
-            llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Saving is not enabled on this region. Use 'Print' instead, then copy & paste to replace the contents of the settings notecard.", kID);
-        else
+        if (osStringStartsWith(msg, "ossl permission error", TRUE)) {
+            llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Could not save the '.settings' notecard. Use 'Print' instead, then copy & paste/replace the output into a notecard called '.settings' within the storage prim - link number "+(string)llGetLinkNumber()+", link name "+llGetObjectName()+" (the %DEVICETYPE% may need to be unlocked for doing this)", kID);
+        } else
             throw;
     }
+    return iRet;
 }
 
-LoadSetting(string sData, integer iLine)
+ParseCardLine(string sData, integer iLine)
 {
     string sID;
     string sToken;
@@ -249,12 +254,77 @@ LoadSetting(string sData, integer iLine)
         for (i = 0; i < llGetListLength(lData); i += 2) {
             sToken = llList2String(lData, i);
             sValue = llList2String(lData, i+1);
-            if (sValue != "" && sID != "auth_")
-                g_lSettings = SetSetting(g_lSettings, sID+sToken, sValue);
+            if (sValue != "") {
+                if (sID == "auth_") {
+                    sToken = llToLower(sToken);
+                    if (llListFindList(["block","trust","owner"], [sToken]) != -1) {
+                        list lTest = llParseString2List(sValue, [","], []);
+                        list lOut;
+                        integer n;
+                        do {
+                            if (llList2Key(lTest, n))
+                                lOut += llList2String(lTest, n);
+                        } while (++n < llGetListLength(lTest));
+                        sValue = llDumpList2String(lOut, ",");
+                        lTest = [];
+                        lOut = [];
+                    }
+                }
+                if (sValue != "") g_lSettings = SetSetting(g_lSettings, sID + sToken, sValue);
+            }
         }
     }
 }
 
+LoadLinksetData()
+{
+    g_lSettings = []; // just to be sure
+    integer iNumTokens = llLinksetDataCountKeys();
+    list lKeys = llLinksetDataListKeys(0, iNumTokens);
+    integer i;
+    for (i = 0; i < llGetListLength(lKeys); i++)
+    {
+        string sToken = llList2String(lKeys,i);
+        string sValue = llLinksetDataRead(sToken);
+
+        if (llListFindList(g_lExceptionTokens, [SplitToken(sToken,0)]) == -1)
+        {
+            integer idx = llListFindList(g_lSettings, [sToken]);
+            if (idx != -1) {
+                g_lSettings = llListReplaceList(g_lSettings, [sValue], idx+1, idx+1);
+                continue;
+            }
+            idx = GroupIndex(g_lSettings, sToken);
+            if (idx != -1) {
+                g_lSettings = llListInsertList(g_lSettings, [sToken, sValue], idx);
+                continue;
+            }
+            g_lSettings = g_lSettings + [sToken, sValue];
+        }
+    }
+    lKeys = []; // force gc
+}
+
+PrintLinksetData()
+{
+    llOwnerSay("--- dump of linksetdata ---\n");
+    integer iNumTokens = llLinksetDataCountKeys();
+    list lKeys = llLinksetDataListKeys(0, iNumTokens);
+    integer i;
+    for (i = 0; i < llGetListLength(lKeys); i++)
+    {
+        string sKey = llList2String(lKeys,i);
+        string sValue = llLinksetDataRead(sKey);
+
+        if (llListFindList(g_lExceptionTokens, [SplitToken(sKey,0)]) == -1)
+        {
+            if (sValue != "")
+                llOwnerSay(sKey+"="+sValue+"\n");
+        }
+    }
+    lKeys = [];
+}
+
 SendValues()
 {
     integer n;
@@ -269,21 +339,26 @@ SendValues()
     for (n = 0; n < llGetListLength(lOut); n++)
         llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, llList2String(lOut, n), "");
     llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, "settings=sent", "");
+    lOut = [];
 }
 
 UserCommand(integer iAuth, string sStr, key kID)
 {
     string sStrLower = llToLower(sStr);
     if (sStrLower == "print settings" || sStrLower == "debug settings") PrintSettings(kID, llGetSubString(sStrLower, 0, 4));
-    else if (llSubStringIndex(sStrLower,"load") == 0) {
+    else if (llSubStringIndex(sStrLower,"load card") == 0) {
         if (iAuth == CMD_OWNER && kID != g_kTempOwner) {
-            if (llGetInventoryKey(g_sCard) != NULL_KEY) {
+            if (llGetInventoryType(g_sCard) == INVENTORY_NOTECARD) {
                 llMessageLinked(LINK_DIALOG, NOTIFY, "0"+ "\n\nLoading backup from "+g_sCard+" card. If you want to load settings from the web, please type: /%CHANNEL% %PREFIX% load url <url>\n\n", kID);
+                llLinksetDataReset();
+                g_lSettings = [];
                 g_kLineID = llGetNotecardLine(g_sCard, g_iLineNr);
             } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"No "+g_sCard+" to load found.", kID);
         } else llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"%NOACCESS%", kID);
-    } else if (llSubStringIndex(sStrLower,"save") == 0) {
-        if (iAuth == CMD_OWNER) SaveSettings(kID);
+    } else if (llSubStringIndex(sStrLower,"save card") == 0) {
+        if (iAuth == CMD_OWNER) SaveCard(kID);
+    } else if (llSubStringIndex(sStrLower,"dump lsd") == 0) { // debug
+        if (iAuth == CMD_OWNER) PrintLinksetData();
     } else if (sStrLower == "reboot" || sStrLower == "reboot --f") {
         if (g_iRebootConfirmed || sStrLower == "reboot --f") {
             llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"Rebooting your %DEVICETYPE% ....", kID);
@@ -294,7 +369,16 @@ UserCommand(integer iAuth, string sStr, key kID)
             g_kConfirmDialogID = llGenerateKey();
             llMessageLinked(LINK_DIALOG, DIALOG, (string)kID+"|\nAre you sure you want to reboot the %DEVICETYPE%?|0|Yes`No|Cancel|"+(string)iAuth, g_kConfirmDialogID);
         }
-    } else if (sStrLower == "runaway") llSetTimerEvent(2.0);
+    } else if (sStrLower == "runaway") {
+        // We'll have to delete the card if we can't save a new one (with no owners set)
+        // due to no ossl permissions, otherwise old owners might still be reloaded
+        // from the old card!
+        if (llGetInventoryType(g_sCard) == INVENTORY_NOTECARD && SaveCard(g_kWearer)==FALSE) {
+            llGiveInventory(g_kWearer, g_sCard);
+            llRemoveInventory(g_sCard);
+        }
+        llSetTimerEvent(2.0);
+    }
 }
 
 PieSlice()
@@ -325,12 +409,9 @@ default
         if (llGetInventoryType("OC_Cuffs_sync") == INVENTORY_SCRIPT) llRemoveInventory("OC_Cuffs_sync");
         llSleep(0.5);
         g_kWearer = llGetOwner();
-        g_iLineNr = 0;
         if (llGetStartParameter() == 0) {
-            if (llGetInventoryType(g_sCard) == INVENTORY_NOTECARD) {
-                g_kCardID = llGetInventoryKey(g_sCard);
-                g_kLineID = llGetNotecardLine(g_sCard, g_iLineNr);
-            } else if (llGetListLength(g_lSettings) > 0) llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, llDumpList2String(g_lSettings, "="), "");
+            LoadLinksetData();
+            llMessageLinked(LINK_ALL_OTHERS, LM_SETTING_RESPONSE, llDumpList2String(g_lSettings, "="), "");
         }
         PieSlice();
     }
@@ -348,11 +429,11 @@ default
     {
         if (kID == g_kLineID) {
             if (sData != EOF) {
-                LoadSetting(sData, ++g_iLineNr);
+                ParseCardLine(sData, ++g_iLineNr);
                 g_kLineID = llGetNotecardLine(g_sCard, g_iLineNr);
             } else {
                 g_iLineNr = 0;
-                LoadSetting(sData, g_iLineNr);
+                ParseCardLine(sData, g_iLineNr);
                 llSetTimerEvent(2.0);
             }
         }
@@ -408,17 +489,5 @@ default
         llSetTimerEvent(0.0);
         SendValues();
     }
-
-    changed(integer iChange)
-    {
-        if ((iChange & CHANGED_INVENTORY) && llGetInventoryKey(g_sCard) != g_kCardID) {
-            // Re-read settings card if it has been changed
-            llSetTimerEvent(0.0);
-            g_iLineNr = 0;
-            g_kCardID = llGetInventoryKey(g_sCard);
-            if (g_kCardID != NULL_KEY)
-                g_kLineID = llGetNotecardLine(g_sCard, g_iLineNr);
-        }
-    }
 }
 

src/device/oc_sys.lsl

@@ -22,7 +22,7 @@
 //on menu request, give dialog, with alphabetized list of submenus
 //on listen, send submenu link message
 
-string g_sCollarVersion="2023.09.06";
+string g_sCollarVersion="2025.12";
 
 key g_kWearer = NULL_KEY;
 
@@ -118,7 +118,7 @@ integer g_iWaitUpdate;
 integer g_iWaitRebuild;
 string g_sIntegrity = "(pending...)";
 
-string g_sHelpCard = "OsCollar Help";
+string g_sHelpCard = ".help";
 
 integer compareVersions(string v1, string v2) { //compares two symantic version strings, true if v1 >= v2
     integer v1Index = llSubStringIndex(v1, ".");
@@ -156,7 +156,7 @@ string NameGroupURI(string sStr){
 
 SettingsMenu(key kID, integer iAuth) {
     string sPrompt = "\nSettings";
-    list lButtons = ["Print","Load","Save","Fix"];
+    list lButtons = ["Print","Load Card","Dump LSD","Fix"];
     lButtons += g_lResizeButtons;
     if (g_iHide) lButtons += ["☐ Visible"];
     else lButtons += ["☑ Visible"];
@@ -177,14 +177,13 @@ UpdateConfirmMenu() {
 HelpMenu(key kID, integer iAuth) {
     string sPrompt="\nVersion: "+g_sCollarVersion+"\n";
     sPrompt += "\nThis %DEVICETYPE% has a "+g_sIntegrity+" core.\n";
-    sPrompt += "\nScript engine: "+osGetScriptEngineName();
     list lUtility = [UPMENU];
     list lStaticButtons=["Help","Update","Version"];
     Dialog(kID, sPrompt, lStaticButtons, lUtility, 0, iAuth, "Help/About");
 }
 
 MainMenu(key kID, integer iAuth) {
-    string sPrompt = "\n𝐎 𝐒 𝐂 𝐨 𝐥 𝐥 𝐚 𝐫\t"+g_sCollarVersion+"\n";
+    string sPrompt = "\nOsCollar\t"+g_sCollarVersion+"\n";
     sPrompt += "\nPrefix: %PREFIX%\nChannel: %CHANNEL%\nSafeword: "+g_sSafeWord;
     list lStaticButtons = ["Apps"];
     if (g_iAnimsMenu) lStaticButtons += "Animations";
@@ -313,15 +312,43 @@ UserCommand(integer iNum, string sStr, key kID, integer fromMenu) {
     }*/
 }
 
-// Returns timestamp in gridtime (PDT/PST) as YYYY-MM-DD.HH:MM:SS
-string GetTimestamp() {
-    integer sltSecs = (integer) llGetWallclock(); // Get SL time in seconds (will be either PST or PDT)
-    integer diff    = (integer) llGetGMTclock() - sltSecs; // Compute the difference between UTC and SLT
-    integer iEpoch = llGetUnixTime(); // UTC unix
-    if (diff == 25200 || diff == -61200) iEpoch -= 25200; // PDT unix
-    else iEpoch -= 28800; // PST unix
-    string sOut = osUnixTimeToTimestamp(iEpoch); // threatlevel VeryLow
-    return llGetSubString(sOut, 0, 18); // strip off unnecessary microseconds
+string GetTimestamp() { // Return a string of the date and time
+    string out;
+    string DateUTC = llGetDate();
+    if (llGetGMTclock() < 28800) { // that's 28800 seconds, a.k.a. 8 hours.
+        list DateList = llParseString2List(DateUTC, ["-", "-"], []);
+        integer year = llList2Integer(DateList, 0);
+        integer month = llList2Integer(DateList, 1);
+        integer day = llList2Integer(DateList, 2);
+       // day = day - 1; //Remember, remember, the 0th of November!
+       if(day==1) {
+           if(month==1) return (string)(year-1) + "-01-31";
+           else {
+                --month;
+                if(month==2) day = 28+(year%4==FALSE); //To do: fix before 28th feb 2100.
+                else day = 30+ (!~llListFindList([4,6,9,11],[month])); //31 days hath == TRUE
+            }
+        }
+        else --day;
+        out=(string)year + "-" + (string)month + "-" + (string)day;
+    } else out=llGetDate();
+    
+    integer t = (integer)llGetWallclock(); // seconds since midnight
+    out += " " + (string)(t / 3600) + ":";
+    
+    integer mins=(t % 3600) / 60;
+    if (mins <10){
+        out += "0";
+    }
+    out += (string)mins+":";
+
+    integer secs=t % 60;
+    if (secs < 10){
+        out += "0";
+    }
+    out += (string)secs;
+    
+    return out;
 }
 
 SetLockElementAlpha() { //EB
@@ -444,8 +471,6 @@ default {
     state_entry() {
         g_kWearer = llGetOwner();
         if (llGetInventoryType("oc_installer_sys")==INVENTORY_SCRIPT) return;
-        string sObjectName = osReplaceString(llGetObjectName(), "\\d+\\.\\d+\\.?\\d+", g_sCollarVersion, -1, 0);
-        if (sObjectName != llGetObjectName()) llSetObjectName(sObjectName);
         g_iHide = !(integer)llGetAlpha(ALL_SIDES);
         if (llGetListLength(g_lCacheAlpha) == 0) RebuildCaches(); // no dummy pair, so cache lost, rebuild
         init();
@@ -514,7 +539,7 @@ default {
                     else if (sMessage == "Help") UserCommand(iAuth, "help", kAv, TRUE);
                     else if (sMessage == "Update") UserCommand(iAuth, "update", kAv, TRUE);
                     else if (sMessage == "Version")
-                        g_kHttpVersion = llHTTPRequest("https://raw.githubusercontent.com/lickx/oscollar-dev/stable/web/device", [], "");
+                        g_kHttpVersion = llHTTPRequest("https://raw.githubusercontent.com/lickx/oscollar-dev/sl/web/device", [], "");
                 } else if (sMenu == "UpdateConfirmMenu"){
                     if (sMessage=="Yes") StartUpdate();
                     else {
@@ -523,8 +548,8 @@ default {
                     }
                 } else if (sMenu == "Settings") {
                     if (sMessage == "Print") llMessageLinked(LINK_SAVE, iAuth, "print settings", kAv);
-                    else if (sMessage == "Load") llMessageLinked(LINK_SAVE, iAuth, sMessage, kAv);
-                    else if (sMessage == "Save") llMessageLinked(LINK_SAVE, iAuth, sMessage, kAv);
+                    else if (sMessage == "Load Card") llMessageLinked(LINK_SAVE, iAuth, sMessage, kAv);
+                    else if (sMessage == "Dump LSD") llMessageLinked(LINK_SAVE, iAuth, sMessage, kAv);
                     else if (sMessage == "Fix") {
                          UserCommand(iAuth, sMessage, kAv, TRUE);
                          return;
@@ -670,7 +695,7 @@ default {
             if (compareVersions(sWebVersion, g_sCollarVersion)) {
                 llOwnerSay("An update is available!");
                 // Fetch a list of distribution sites:
-                g_kHttpDistsites = llHTTPRequest("https://raw.githubusercontent.com/lickx/oscollar-dev/stable/web/distsites", [], "");
+                g_kHttpDistsites = llHTTPRequest("https://raw.githubusercontent.com/lickx/oscollar-dev/sl/web/distsites", [], "");
             } else
                 llOwnerSay("You are using the most recent version");
         } else if (kID == g_kHttpDistsites) {
@@ -678,4 +703,4 @@ default {
             llOwnerSay(sBody);
         }
     }
-}
+}

src/extensions/oc_couples.lsl

@@ -379,8 +379,8 @@ default
         llMessageLinked(LINK_DIALOG, NOTIFY, "0"+"If you would like to stop the animation early, say /" + (string)g_iStopChan + g_sStopString + " to stop.", g_kPartner);
         string sText = llList2String(g_lAnimSettings, (g_iCmdIndex*4) + 3);
         if (sText != "" && g_iVerbose) {
-            sText = osReplaceString(sText, "_PARTNER_" ,g_sPartnerName, -1, 0);
-            sText = osReplaceString(sText, "_SELF_", "%WEARERNAME%", -1, 0);
+            sText = llReplaceSubString(sText, "_PARTNER_" ,g_sPartnerName, 0);
+            sText = llReplaceSubString(sText, "_SELF_", "%WEARERNAME%", 0);
             llMessageLinked(LINK_DIALOG,SAY, "0"+sText, "");
         }
         if (g_fTimeOut > 0.0) {

src/extensions/oc_looks.lsl

@@ -361,7 +361,7 @@ UserCommand(integer iNum, string sStr, key kID, integer reMenu, integer iPage)
                     if (iDefaultTextureIndex != -1) sTextureShortName = llList2String(g_lTextureDefaults, iDefaultTextureIndex+1);
                 }
                 integer iTextureIndex = llListFindList(g_lTextures,[sElement+"~"+sTextureShortName]);
-                if (osIsUUID(sTextureShortName)) iTextureIndex = 0;
+                if ((key)sTextureShortName) iTextureIndex = 0;
                 else if (iTextureIndex == -1)
                     iTextureIndex = llListFindList(g_lTextures,[sTextureShortName]);
                 if (sTextureShortName == "") {
@@ -371,7 +371,7 @@ UserCommand(integer iNum, string sStr, key kID, integer reMenu, integer iPage)
                     if (reMenu) TextureMenu(kID, 0, iNum, sCommand+" "+sElement);
                 } else {
                     string sTextureKey;
-                    if (osIsUUID(sTextureShortName)) sTextureKey = sTextureShortName;
+                    if ((key)sTextureShortName) sTextureKey = sTextureShortName;
                     else sTextureKey = llList2String(g_lTextureKeys,iTextureIndex);
                     integer iLinkCount = llGetNumberOfPrims()+1;
                     while (iLinkCount-- > 2) {

src/extensions/oc_themes.lsl

@@ -359,7 +359,7 @@ UserCommand(integer iNum, string sStr, key kID, integer reMenu, integer iPage)
                     if (iDefaultTextureIndex != -1) sTextureShortName = llList2String(g_lTextureDefaults, iDefaultTextureIndex+1);
                 }
                 integer iTextureIndex = llListFindList(g_lTextures, [sElement+"~"+sTextureShortName]);
-                if (osIsUUID(sTextureShortName)) iTextureIndex = 0;
+                if ((key)sTextureShortName) iTextureIndex = 0;
                 else if (iTextureIndex == -1)
                     iTextureIndex = llListFindList(g_lTextures, [sTextureShortName]);
                 if (sTextureShortName == "") {
@@ -369,7 +369,7 @@ UserCommand(integer iNum, string sStr, key kID, integer reMenu, integer iPage)
                     if (reMenu) TextureMenu(kID, 0, iNum, sCommand+" "+sElement);
                 } else {
                     string sTextureKey;
-                    if (osIsUUID(sTextureShortName)) sTextureKey = sTextureShortName;
+                    if ((key)sTextureShortName) sTextureKey = sTextureShortName;
                     else sTextureKey = llList2String(g_lTextureKeys, iTextureIndex);
                     integer iLinkCount = llGetNumberOfPrims()+1;
                     while (iLinkCount-- > 1) {

src/installer/BUNDLE_00_DEPRECATED

@@ -2,7 +2,7 @@ SCRIPT|oc_root
 SCRIPT|oc_update
 SCRIPT|oc_stealth
 SCRIPT|oc_lock
-ITEM|.license
-ITEM|.help
+ITEM|OsCollar License
+ITEM|OsCollar Help
 ITEM|chain
 ITEM|rope

src/installer/BUNDLE_42_REQUIRED

@@ -12,8 +12,8 @@ SCRIPT|oc_resizer
 SCRIPT|oc_rlvsuite
 SCRIPT|oc_themes
 SCRIPT|oc_titler
-ITEM|OsCollar License
-ITEM|OsCollar Help
+ITEM|.license
+ITEM|.help
 ITEM|sound_lock
 ITEM|sound_unlock
 ITEM|leash_chain

src/installer/oc_update_shim.lsl

@@ -155,10 +155,6 @@ default
             Check4Core5Script();
             string sResponse = llDumpList2String([sType, sName, sCmd], "|");
             //Debug("responding: " + response);
-            // Bug in older OpenSim versions, fixed since 2018-10-18:
-            // 7391: Messages sent with llRegionSayTo are only received by one listening script per prim (object?)
-            // See: http://opensimulator.org/mantis/view.php?id=7391
-            //llRegionSay(iChannel, sResponse); // workaround
             llRegionSayTo(kID, iChannel, sResponse);
         } else if (sMsg == "Core5Done") Check4Core5Script();
         else if (llSubStringIndex(sMsg, "DONE") == 0){
@@ -180,7 +176,7 @@ default
                             integer i;
                             for (i = 0; i < llGetListLength(lTest); ++i) {
                                 string sValue = llList2String(lTest, i);
-                                if (osIsUUID(sValue)) {}
+                                if ((key)sValue) {}
                                 else lTest = llDeleteSubList(lTest, i, i);
                             }
                             sSetting = sToken+"="+llDumpList2String(lTest,",");

src/ownerhud/README.md

@@ -2,4 +2,4 @@
 
 ###### A graphical user interface for ease of access to OsCollar scripted devices.
 
-Formerly "OpenCollar Owner HUD", this variation is vastly slimmed down and more resource friendly. There are also a lot more buttons on the device itself. The new button textures can be found in the ./res directory of this repo; they are created by and used with permission from Wendy Starfall.
+

src/ownerhud/oc_oh_dialog.lsl

@@ -402,7 +402,7 @@ default
                 while(numAgents--) {
                     key avId = llList2Key(agentList, numAgents);
                     string name = llKey2Name(avId);
-                    if ( llSubStringIndex(llToLower(name), llToLower(find)) == -1 || llListFindList(excl,[(string)avId]) != -1 || osIsNpc(avId)) {       //if this name does not contain find string or key is in the exclude list
+                    if ( llSubStringIndex(llToLower(name), llToLower(find)) == -1 || llListFindList(excl,[(string)avId]) != -1) {       //if this name does not contain find string or key is in the exclude list
                         agentList = llDeleteSubList(agentList, numAgents, numAgents); //delete this agent from the list
                     }
                 }

src/ownerhud/oc_oh_options.lsl

@@ -340,7 +340,7 @@ StoreSettings()
     // Store button order:
     integer idx = llListFindList(g_lButtons, "Hudmenu");
     if (idx != -1) {
-        string sOrder = osReplaceString(llList2CSV(g_lPrimOrder), " ", "", -1, 0);
+        string sOrder = llReplaceSubString(llList2CSV(g_lPrimOrder), " ", "", 0);
         sOldSettings = llList2String(llGetLinkPrimitiveParams(idx, [PRIM_DESC]), 0);
         if (sOldSettings != sOrder) llSetLinkPrimitiveParamsFast(idx, [PRIM_DESC, sOrder]);
     }

src/ownerhud/oc_oh_sys.lsl

@@ -22,7 +22,7 @@
 
 //merged HUD-menu, HUD-leash and HUD-rezzer into here June 2015 Otto (garvin.twine)
 
-string g_sVersion = "2023.01.19";
+string g_sVersion = "2025.05";
 
 list g_lPartners;
 list g_lNewPartnerIDs;
@@ -217,7 +217,7 @@ Dialog(string sPrompt, list lChoices, list lUtilityButtons, integer iPage, strin
 
 MainMenu()
 {
-    string sPrompt = "\n𝐎 𝐒 𝐂 𝐨 𝐥 𝐥 𝐚 𝐫  Owner HUD\t"+g_sVersion;
+    string sPrompt = "\nOsCollar - Owner HUD\t"+g_sVersion;
     sPrompt += "\n\nSelected Partner: "+NameURI(g_sActivePartnerID);
     list lButtons = g_lMainMenuButtons + g_lMenus;
     Dialog(sPrompt, lButtons, [], 0, g_sMainMenu);
@@ -321,8 +321,6 @@ default {
     state_entry() {
         g_kOwner = llGetOwner();
         if (llGetInventoryType("oc_installer_sys") == INVENTORY_SCRIPT) return;
-        string sObjectName = osReplaceString(llGetObjectName(), "\\d+\\.\\d+\\.?\\d+", g_sVersion, -1, 0);
-        if (sObjectName != llGetObjectName()) llSetObjectName(sObjectName);
         llSleep(1.0);//giving time for others to reset before populating menu
         g_iListener = llListen(PersonalChannel(g_kOwner, 0), "", "", ""); //lets listen here
         g_iCmdListener = llListen(g_iChannel, "", g_kOwner, "");
@@ -446,7 +444,7 @@ default {
                      i =  llGetListLength(lAgents);
                      do {
                         kID = llList2Key(lAgents, --i);
-                        if (kID != g_kOwner && llListFindList(g_lPartners,[(string)kID]) == -1 && !osIsNpc(kID)) {
+                        if (kID != g_kOwner && llListFindList(g_lPartners,[(string)kID]) == -1) {
                             if (llGetListLength(g_lListeners) < 60) {//Only 65 listens can simultaneously be open in any single script (SL wiki)
                                 iChannel = PersonalChannel(kID, 0);
                                 g_lListeners += [llListen(iChannel, "", "", "" )] ;

src/spares/oc_cagehome.lsl

@@ -614,8 +614,8 @@ SetState(integer iState) {
         g_kOwnerRequestHandle = llRequestAgentData(g_kCageOwnerKey, DATA_ONLINE);
     } else if (iState == iWARNING) {
         if (g_iWarningTime > 1) {
-            string sMsg = osReplaceString(g_sWarningMessage, "@", Name(g_kWearer), -1, 0);
-            sMsg = osReplaceString(sMsg, "#", (string)g_iWarningTime, -1, 0);
+            string sMsg = llReplaceSubString(g_sWarningMessage, "@", Name(g_kWearer), 0);
+            sMsg = llReplaceSubString(sMsg, "#", (string)g_iWarningTime, 0);
             string sObjectName = llGetObjectName();
             llSetObjectName(g_sPluginTitle);
             llSay(0, sMsg);

src/spares/oc_legacy_relay.lsl

@@ -133,7 +133,7 @@ Dialog(key kID, string sPrompt, list lChoices, list lUtilityButtons, integer iPa
 // Sanitizes a key coming from the outside, so that only valid
 // keys are returned, and invalid ones are mapped to NULL_KEY
 key SanitizeKey(string uuid) {
-    if (osIsUUID(uuid)) return llToLower(uuid);
+    if ((key)uuid) return llToLower(uuid);
     return NULL_KEY;
 }
 

web/ao

@@ -0,0 +1 @@
+2025.12

web/device

@@ -1 +1 @@
-2023.09.06
+2025.12

web/distsites

@@ -1,8 +1,8 @@
 
 Get an updater at:
 
-ArcadiaShop
-hop://hg.osgrid.org:80/ArcadiaShop/271/441/37
+Place1
+slurl
 
-Kinky Hub
-hop://hg.tamai.nl:80/Eternal/206/190/20
+Place2
+slurl