From 2a95231e6b81d9130e41182aa631d1a6ed1d2e6d Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 6 Sep 2021 21:30:21 +1000 Subject: Tweak the loggers. --- 1AOor2.lsl | 44 ++++++++++++++++++++++---------------------- 1ring.lsl | 26 +++++++++++++------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/1AOor2.lsl b/1AOor2.lsl index 6bc6c2d..b3518f3 100644 --- a/1AOor2.lsl +++ b/1AOor2.lsl @@ -257,7 +257,7 @@ d("linky RESET_DONE"); Settings = llList2List(input, 2, -1); doSettings(id, Settings); laterInit(); - s(Owner, "Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); + S("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); } } // END boilerplate, mostly. @@ -306,7 +306,7 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ if ("SET " == llGetSubString(button, 0, 3)) { set = listFindString(Settings, fr + cmd, sSTRIDE); - if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); + if (-1 != set) setSetting(id, fr + cmd, data, fINT); else S("Unknown setting '" + cmd); } if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; integer st = findSitter(id); @@ -455,11 +455,11 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ if (osIsNpc(Stalkee)) { Chosen = 1; - s(Owner, llKey2Name(data) + " is an NPC, forcing them to '" + What + "' with you."); + s(llKey2Name(data) + " is an NPC, forcing them to '" + What + "' with you."); } else { - s(Owner, "Asking " + llKey2Name(Stalkee) + " if they would like to do '" + What + "' with you."); + s("Asking " + llKey2Name(Stalkee) + " if they would like to do '" + What + "' with you."); dynamicMenu(Stalkee, "", What, llKey2Name(Owner) + " would like to do '" + What + "' with you.", "Yes|No", "COUPLE_YES " + Stalkee + "|COUPLE_NO " + Stalkee); @@ -509,22 +509,22 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ { Chosen = -1; addEvent(0.0, "COUPLE_TIMEOUT"); - sendScript(lCMD, "1ring", [fINT, id, Stalkee, "STOP", ""]); - s(Owner, llKey2Name(id) + " said no to your offer of '" + What + "'."); + sendScript(lCMD, "1ring", [fINT, Owner, Stalkee, "STOP", ""]); + S(llKey2Name(id) + " said no to your offer of '" + What + "''."); } else if ("COUPLE_YES" == cmd) { Chosen = 1; addEvent(0.0, "COUPLE_TIMEOUT"); - sendScript(lCMD, "1ring", [fINT, id, Stalkee, "STOP", ""]); - s(Owner, llKey2Name(id) + " said yes to your offer of '" + What + "."); + sendScript(lCMD, "1ring", [fINT, Owner, Stalkee, "STOP", ""]); + s(llKey2Name(id) + " said yes to your offer of '" + What + "'."); } else if ("COUPLE_TIMEOUT" == cmd) { if (NULL_KEY != Stalkee) { Chosen = -1; - s(Owner, llKey2Name(Stalkee) + " didn't answer your offer of '" + What + "."); + S(llKey2Name(Stalkee) + " didn't answer your offer of '" + What + "."); s(Stalkee, "You failed to answer " + llKey2Name(Owner) + "'s offer to '" + What + "' with you."); } } @@ -557,7 +557,7 @@ d("SIT_DONE for " + llKey2Name(data)); if(data == Stalkee) { llOwnerSay("@sit:" + TheirKey + "=force"); - s(Owner, "Switching AO to 1AOor2 couples object."); + s("Switching AO to 1AOor2 couples object."); Controller = Owner; d("SIT_DONE is requesting camera and controls from " + llKey2Name(Controller)); llRequestPermissions(Controller, PERMISSION_CONTROL_CAMERA | PERMISSION_TAKE_CONTROLS); @@ -569,26 +569,26 @@ d("SIT_DONE for " + llKey2Name(data)); TheirKey = NULL_KEY; if (99.0 <= TPangle) { - s(Owner, "Switching AO to 1ring object."); - Pose = ""; + s("Switching AO to 1ring object."); + nextPose = ""; oldController(Owner); } } else if ("ADJUST" == cmd) { - if (Attached) s("You need to be in a couples interaction with someone to use the ADJUST function."); + if (Attached) s(id, "You need to be in a couples interaction with someone to use the ADJUST function."); else {showMenu(id); return FALSE;} } else if ("SAVE" == cmd) { - if (Attached) s(Owner, "You need to be in a couples interaction with someone to use the SAVE function."); + if (Attached) s(id, "You need to be in a couples interaction with someone to use the SAVE function."); else sendPrim(BossKey, "SAVE_POSES", [llDumpList2String(reportPose(), "\n")]); } else if ("SAVE_POSES" == cmd) { integer i = llGetInventoryNumber(INVENTORY_NOTECARD); list cards = []; - s(Owner, "Backing up old cards."); + s("Backing up old cards."); while (i-- > 0) { string item = llGetInventoryName(INVENTORY_NOTECARD, i); @@ -603,7 +603,7 @@ d("SIT_DONE for " + llKey2Name(data)); llRemoveInventory(item); } osMakeNotecard(".POSITIONS", data); - s(Owner, "Current positions saved to the .POSITIONS notecard."); + S("Current positions saved to the .POSITIONS notecard."); } else if ("TPRIM" == cmd) { @@ -656,8 +656,8 @@ d("New URL " + URL); } else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) { - if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); - else s("Unknown command '" + cmd + "' from - " + button); + if (fMENU == source) S("Unknown menu command '" + cmd + "' from - " + button); + else S("Unknown command '" + cmd + "' from - " + button); } return (source == fMENU); } @@ -1801,7 +1801,7 @@ checkLag() else if (25 <= newLag) l = "Medium"; else if (15 <= newLag) l = "Lots of"; else l = "Way too much"; - if (!osIsNpc(llGetOwner())) s(Owner, l + " lag, tick is " + (string) Tick); + if (!osIsNpc(llGetOwner())) s(l + " lag, tick is " + (string) Tick); } } @@ -1863,7 +1863,7 @@ die() d("Deleting myself."); sendPrim(BossKey, "DIE_DONE", []); if (PERM_COPY & llGetObjectPermMask(MASK_OWNER)) llDie(); - else s("This no copy object wont delete itself, please delete manually, or take into inventory."); + else S("This no copy object wont delete itself, please delete manually, or take into inventory."); } default @@ -1897,8 +1897,8 @@ d("\n\n1AOor2 sending RESET @ " + (string) Start + "\n"); rotation RefRot = llGetRot(); llRezObject("1AOor2 prim", ZERO_VECTOR * RefRot + RefPos, ZERO_VECTOR, (ZERO_ROTATION) * RefRot, PIN); llOwnerSay("@setrot:" + (string) TPangle + "=force"); - s(Owner, "Switching AO to 1ring object."); - Pose = ""; + s("Switching AO to 1ring object."); + nextPose = ""; oldController(Owner); TPangle = 999.0; Chosen = 1; diff --git a/1ring.lsl b/1ring.lsl index bd24067..c3c3d52 100644 --- a/1ring.lsl +++ b/1ring.lsl @@ -281,7 +281,7 @@ d("linky RESET_DONE"); Settings = llList2List(input, 2, -1); doSettings(id, Settings); laterInit(); - s("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); + S("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); } } // END boilerplate, mostly. @@ -405,7 +405,7 @@ integer changeAccess(key id, string cmd, key person, integer source) s(id, "You added a " + mW + " - " + osKey2Name(person)); } else - s("Can't find " + eW + " " + person); + S("Can't find " + eW + " " + person); } else if ("OLD" == t) { @@ -422,7 +422,7 @@ integer changeAccess(key id, string cmd, key person, integer source) s(id, "You removed a " + mW + " - " + osKey2Name(person)); } else - s("Can't find " + eW + " " + person); + S("Can't find " + eW + " " + person); } showAccess(id); return FALSE; @@ -440,7 +440,7 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ if ("SET " == llGetSubString(button, 0, 3)) { set = listFindString(Settings, fr + cmd, sSTRIDE); - if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); + if (-1 != set) setSetting(id, fr + cmd, data, fINT); else S("Unknown setting '" + cmd); } if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; @@ -527,7 +527,7 @@ llShout(0, "AAAHHHHH!"); } else { - D("Unknown CHOOSE_ALL option - " + button); + D("Unknown CHOOSE_ALL option - " + data); return FALSE; } sendScript(lSCAN, [id] + s); @@ -714,7 +714,7 @@ s("YAY! Freeeeeee at last!!!!!"); osTeleportAgent(Owner, llList2String(TPtDestination, 1), llList2Vector(TPtDestination, 2), <1.0,1.0,1.0>); } else if ("TESTS" == cmd) - s("selected test " + data); + S("selected test " + data); else if ("URL" == cmd) { URL = data; @@ -726,8 +726,8 @@ d("New URL " + URL); ; else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) { - if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); - else s("Unknown command '" + cmd + "' from - " + button); + if (fMENU == source) S("Unknown menu command '" + cmd + "' from - " + button); + else S("Unknown command '" + cmd + "' from - " + button); } return (source == fMENU); } @@ -895,7 +895,7 @@ vector getRange(key this) if (0 == llGetListLength(det)) { // Note - we can't use llGetObjectDetails() here, coz they might not be in adjacent sims either. - s("Can't find " + osKey2Name(this) + " in the sim."); + S("Can't find " + osKey2Name(this) + " in the sim."); stopGoto(TRUE); return ZERO_VECTOR; } @@ -1260,7 +1260,7 @@ string gotRLV(integer chan, integer g, string message) else { d("RLV command " + r + " not responding! Giving up."); - s("Your viewer is taking too long to start up RLV."); + S("Your viewer is taking too long to start up RLV."); } if (0 != h) llListenRemove(h); RLVq = llListReplaceList(RLVq, [], f, f + qSTRIDE - 1); @@ -1307,12 +1307,12 @@ d("gotRLV @notify response - " + message); if (-1 == f) bl += [llList2String(RLVu, i)]; } - s("RLV started up in " + (string) (llGetTimeOfDay() - Start) + " seconds.\n" + s("RLV started up in " + (string) (llGetTimeOfDay() - Start) + " seconds. " + llGetListLength(RLVa) + " RLV commands, " + llGetListLength(RLVb)+ " RLV black listed commands - " + llDumpList2String(RLVb, " / ")); if (0 != llGetListLength(bl)) - s("The following RLV commands are unsupported by your viewer, or blacklisted - " + d("The following RLV commands are unsupported by your viewer, or blacklisted - " + llDumpList2String(bl, ", ") + "\nSome things may or may not work. That list may not be accurate."); justRLV("notify:" + (RLVchannel - 1) + "=add"); @@ -1368,7 +1368,7 @@ d("\n\n1ring sending RESET @ " + (string) Start + "\n"); { if ((NULL_KEY != id) && ((llGetTimeOfDay() - Start) > 60.0)) { - s("Attach detected, and RLV didn't respond yet, resetting."); + S("Attach detected, and RLV didn't respond yet, resetting."); // llResetScript(); } } -- cgit v1.1