diff options
author | onefang | 2021-09-06 21:30:21 +1000 |
---|---|---|
committer | onefang | 2021-09-06 21:30:21 +1000 |
commit | 2a95231e6b81d9130e41182aa631d1a6ed1d2e6d (patch) | |
tree | a29ce2bffc9912ebc92e1bf951acf0d950702a18 | |
parent | Rejig how OhSilly detection works. (diff) | |
download | 1ring-2a95231e6b81d9130e41182aa631d1a6ed1d2e6d.zip 1ring-2a95231e6b81d9130e41182aa631d1a6ed1d2e6d.tar.gz 1ring-2a95231e6b81d9130e41182aa631d1a6ed1d2e6d.tar.bz2 1ring-2a95231e6b81d9130e41182aa631d1a6ed1d2e6d.tar.xz |
Tweak the loggers.
Diffstat (limited to '')
-rw-r--r-- | 1AOor2.lsl | 44 | ||||
-rw-r--r-- | 1ring.lsl | 26 |
2 files changed, 35 insertions, 35 deletions
@@ -257,7 +257,7 @@ d("linky RESET_DONE"); | |||
257 | Settings = llList2List(input, 2, -1); | 257 | Settings = llList2List(input, 2, -1); |
258 | doSettings(id, Settings); | 258 | doSettings(id, Settings); |
259 | laterInit(); | 259 | laterInit(); |
260 | s(Owner, "Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); | 260 | S("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); |
261 | } | 261 | } |
262 | } | 262 | } |
263 | // END boilerplate, mostly. | 263 | // END boilerplate, mostly. |
@@ -306,7 +306,7 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ | |||
306 | if ("SET " == llGetSubString(button, 0, 3)) | 306 | if ("SET " == llGetSubString(button, 0, 3)) |
307 | { | 307 | { |
308 | set = listFindString(Settings, fr + cmd, sSTRIDE); | 308 | set = listFindString(Settings, fr + cmd, sSTRIDE); |
309 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); | 309 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else S("Unknown setting '" + cmd); |
310 | } | 310 | } |
311 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; | 311 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; |
312 | integer st = findSitter(id); | 312 | integer st = findSitter(id); |
@@ -455,11 +455,11 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ | |||
455 | if (osIsNpc(Stalkee)) | 455 | if (osIsNpc(Stalkee)) |
456 | { | 456 | { |
457 | Chosen = 1; | 457 | Chosen = 1; |
458 | s(Owner, llKey2Name(data) + " is an NPC, forcing them to '" + What + "' with you."); | 458 | s(llKey2Name(data) + " is an NPC, forcing them to '" + What + "' with you."); |
459 | } | 459 | } |
460 | else | 460 | else |
461 | { | 461 | { |
462 | s(Owner, "Asking " + llKey2Name(Stalkee) + " if they would like to do '" + What + "' with you."); | 462 | s("Asking " + llKey2Name(Stalkee) + " if they would like to do '" + What + "' with you."); |
463 | dynamicMenu(Stalkee, "", What, | 463 | dynamicMenu(Stalkee, "", What, |
464 | llKey2Name(Owner) + " would like to do '" + What + "' with you.", | 464 | llKey2Name(Owner) + " would like to do '" + What + "' with you.", |
465 | "Yes|No", "COUPLE_YES " + Stalkee + "|COUPLE_NO " + Stalkee); | 465 | "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 | |||
509 | { | 509 | { |
510 | Chosen = -1; | 510 | Chosen = -1; |
511 | addEvent(0.0, "COUPLE_TIMEOUT"); | 511 | addEvent(0.0, "COUPLE_TIMEOUT"); |
512 | sendScript(lCMD, "1ring", [fINT, id, Stalkee, "STOP", ""]); | 512 | sendScript(lCMD, "1ring", [fINT, Owner, Stalkee, "STOP", ""]); |
513 | s(Owner, llKey2Name(id) + " said no to your offer of '" + What + "'."); | 513 | S(llKey2Name(id) + " said no to your offer of '" + What + "''."); |
514 | } | 514 | } |
515 | else if ("COUPLE_YES" == cmd) | 515 | else if ("COUPLE_YES" == cmd) |
516 | { | 516 | { |
517 | Chosen = 1; | 517 | Chosen = 1; |
518 | addEvent(0.0, "COUPLE_TIMEOUT"); | 518 | addEvent(0.0, "COUPLE_TIMEOUT"); |
519 | sendScript(lCMD, "1ring", [fINT, id, Stalkee, "STOP", ""]); | 519 | sendScript(lCMD, "1ring", [fINT, Owner, Stalkee, "STOP", ""]); |
520 | s(Owner, llKey2Name(id) + " said yes to your offer of '" + What + "."); | 520 | s(llKey2Name(id) + " said yes to your offer of '" + What + "'."); |
521 | } | 521 | } |
522 | else if ("COUPLE_TIMEOUT" == cmd) | 522 | else if ("COUPLE_TIMEOUT" == cmd) |
523 | { | 523 | { |
524 | if (NULL_KEY != Stalkee) | 524 | if (NULL_KEY != Stalkee) |
525 | { | 525 | { |
526 | Chosen = -1; | 526 | Chosen = -1; |
527 | s(Owner, llKey2Name(Stalkee) + " didn't answer your offer of '" + What + "."); | 527 | S(llKey2Name(Stalkee) + " didn't answer your offer of '" + What + "."); |
528 | s(Stalkee, "You failed to answer " + llKey2Name(Owner) + "'s offer to '" + What + "' with you."); | 528 | s(Stalkee, "You failed to answer " + llKey2Name(Owner) + "'s offer to '" + What + "' with you."); |
529 | } | 529 | } |
530 | } | 530 | } |
@@ -557,7 +557,7 @@ d("SIT_DONE for " + llKey2Name(data)); | |||
557 | if(data == Stalkee) | 557 | if(data == Stalkee) |
558 | { | 558 | { |
559 | llOwnerSay("@sit:" + TheirKey + "=force"); | 559 | llOwnerSay("@sit:" + TheirKey + "=force"); |
560 | s(Owner, "Switching AO to 1AOor2 couples object."); | 560 | s("Switching AO to 1AOor2 couples object."); |
561 | Controller = Owner; | 561 | Controller = Owner; |
562 | d("SIT_DONE is requesting camera and controls from " + llKey2Name(Controller)); | 562 | d("SIT_DONE is requesting camera and controls from " + llKey2Name(Controller)); |
563 | llRequestPermissions(Controller, PERMISSION_CONTROL_CAMERA | PERMISSION_TAKE_CONTROLS); | 563 | llRequestPermissions(Controller, PERMISSION_CONTROL_CAMERA | PERMISSION_TAKE_CONTROLS); |
@@ -569,26 +569,26 @@ d("SIT_DONE for " + llKey2Name(data)); | |||
569 | TheirKey = NULL_KEY; | 569 | TheirKey = NULL_KEY; |
570 | if (99.0 <= TPangle) | 570 | if (99.0 <= TPangle) |
571 | { | 571 | { |
572 | s(Owner, "Switching AO to 1ring object."); | 572 | s("Switching AO to 1ring object."); |
573 | Pose = ""; | 573 | nextPose = ""; |
574 | oldController(Owner); | 574 | oldController(Owner); |
575 | } | 575 | } |
576 | } | 576 | } |
577 | else if ("ADJUST" == cmd) | 577 | else if ("ADJUST" == cmd) |
578 | { | 578 | { |
579 | if (Attached) s("You need to be in a couples interaction with someone to use the ADJUST function."); | 579 | if (Attached) s(id, "You need to be in a couples interaction with someone to use the ADJUST function."); |
580 | else {showMenu(id); return FALSE;} | 580 | else {showMenu(id); return FALSE;} |
581 | } | 581 | } |
582 | else if ("SAVE" == cmd) | 582 | else if ("SAVE" == cmd) |
583 | { | 583 | { |
584 | if (Attached) s(Owner, "You need to be in a couples interaction with someone to use the SAVE function."); | 584 | if (Attached) s(id, "You need to be in a couples interaction with someone to use the SAVE function."); |
585 | else sendPrim(BossKey, "SAVE_POSES", [llDumpList2String(reportPose(), "\n")]); | 585 | else sendPrim(BossKey, "SAVE_POSES", [llDumpList2String(reportPose(), "\n")]); |
586 | } | 586 | } |
587 | else if ("SAVE_POSES" == cmd) | 587 | else if ("SAVE_POSES" == cmd) |
588 | { | 588 | { |
589 | integer i = llGetInventoryNumber(INVENTORY_NOTECARD); | 589 | integer i = llGetInventoryNumber(INVENTORY_NOTECARD); |
590 | list cards = []; | 590 | list cards = []; |
591 | s(Owner, "Backing up old cards."); | 591 | s("Backing up old cards."); |
592 | while (i-- > 0) | 592 | while (i-- > 0) |
593 | { | 593 | { |
594 | string item = llGetInventoryName(INVENTORY_NOTECARD, i); | 594 | string item = llGetInventoryName(INVENTORY_NOTECARD, i); |
@@ -603,7 +603,7 @@ d("SIT_DONE for " + llKey2Name(data)); | |||
603 | llRemoveInventory(item); | 603 | llRemoveInventory(item); |
604 | } | 604 | } |
605 | osMakeNotecard(".POSITIONS", data); | 605 | osMakeNotecard(".POSITIONS", data); |
606 | s(Owner, "Current positions saved to the .POSITIONS notecard."); | 606 | S("Current positions saved to the .POSITIONS notecard."); |
607 | } | 607 | } |
608 | else if ("TPRIM" == cmd) | 608 | else if ("TPRIM" == cmd) |
609 | { | 609 | { |
@@ -656,8 +656,8 @@ d("New URL " + URL); | |||
656 | } | 656 | } |
657 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) | 657 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) |
658 | { | 658 | { |
659 | if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); | 659 | if (fMENU == source) S("Unknown menu command '" + cmd + "' from - " + button); |
660 | else s("Unknown command '" + cmd + "' from - " + button); | 660 | else S("Unknown command '" + cmd + "' from - " + button); |
661 | } | 661 | } |
662 | return (source == fMENU); | 662 | return (source == fMENU); |
663 | } | 663 | } |
@@ -1801,7 +1801,7 @@ checkLag() | |||
1801 | else if (25 <= newLag) l = "Medium"; | 1801 | else if (25 <= newLag) l = "Medium"; |
1802 | else if (15 <= newLag) l = "Lots of"; | 1802 | else if (15 <= newLag) l = "Lots of"; |
1803 | else l = "Way too much"; | 1803 | else l = "Way too much"; |
1804 | if (!osIsNpc(llGetOwner())) s(Owner, l + " lag, tick is " + (string) Tick); | 1804 | if (!osIsNpc(llGetOwner())) s(l + " lag, tick is " + (string) Tick); |
1805 | } | 1805 | } |
1806 | } | 1806 | } |
1807 | 1807 | ||
@@ -1863,7 +1863,7 @@ die() | |||
1863 | d("Deleting myself."); | 1863 | d("Deleting myself."); |
1864 | sendPrim(BossKey, "DIE_DONE", []); | 1864 | sendPrim(BossKey, "DIE_DONE", []); |
1865 | if (PERM_COPY & llGetObjectPermMask(MASK_OWNER)) llDie(); | 1865 | if (PERM_COPY & llGetObjectPermMask(MASK_OWNER)) llDie(); |
1866 | else s("This no copy object wont delete itself, please delete manually, or take into inventory."); | 1866 | else S("This no copy object wont delete itself, please delete manually, or take into inventory."); |
1867 | } | 1867 | } |
1868 | 1868 | ||
1869 | default | 1869 | default |
@@ -1897,8 +1897,8 @@ d("\n\n1AOor2 sending RESET @ " + (string) Start + "\n"); | |||
1897 | rotation RefRot = llGetRot(); | 1897 | rotation RefRot = llGetRot(); |
1898 | llRezObject("1AOor2 prim", ZERO_VECTOR * RefRot + RefPos, ZERO_VECTOR, (ZERO_ROTATION) * RefRot, PIN); | 1898 | llRezObject("1AOor2 prim", ZERO_VECTOR * RefRot + RefPos, ZERO_VECTOR, (ZERO_ROTATION) * RefRot, PIN); |
1899 | llOwnerSay("@setrot:" + (string) TPangle + "=force"); | 1899 | llOwnerSay("@setrot:" + (string) TPangle + "=force"); |
1900 | s(Owner, "Switching AO to 1ring object."); | 1900 | s("Switching AO to 1ring object."); |
1901 | Pose = ""; | 1901 | nextPose = ""; |
1902 | oldController(Owner); | 1902 | oldController(Owner); |
1903 | TPangle = 999.0; | 1903 | TPangle = 999.0; |
1904 | Chosen = 1; | 1904 | Chosen = 1; |
@@ -281,7 +281,7 @@ d("linky RESET_DONE"); | |||
281 | Settings = llList2List(input, 2, -1); | 281 | Settings = llList2List(input, 2, -1); |
282 | doSettings(id, Settings); | 282 | doSettings(id, Settings); |
283 | laterInit(); | 283 | laterInit(); |
284 | s("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); | 284 | S("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start)); |
285 | } | 285 | } |
286 | } | 286 | } |
287 | // END boilerplate, mostly. | 287 | // END boilerplate, mostly. |
@@ -405,7 +405,7 @@ integer changeAccess(key id, string cmd, key person, integer source) | |||
405 | s(id, "You added a " + mW + " - " + osKey2Name(person)); | 405 | s(id, "You added a " + mW + " - " + osKey2Name(person)); |
406 | } | 406 | } |
407 | else | 407 | else |
408 | s("Can't find " + eW + " " + person); | 408 | S("Can't find " + eW + " " + person); |
409 | } | 409 | } |
410 | else if ("OLD" == t) | 410 | else if ("OLD" == t) |
411 | { | 411 | { |
@@ -422,7 +422,7 @@ integer changeAccess(key id, string cmd, key person, integer source) | |||
422 | s(id, "You removed a " + mW + " - " + osKey2Name(person)); | 422 | s(id, "You removed a " + mW + " - " + osKey2Name(person)); |
423 | } | 423 | } |
424 | else | 424 | else |
425 | s("Can't find " + eW + " " + person); | 425 | S("Can't find " + eW + " " + person); |
426 | } | 426 | } |
427 | showAccess(id); | 427 | showAccess(id); |
428 | return FALSE; | 428 | return FALSE; |
@@ -440,7 +440,7 @@ integer doThing(key id, string button, string fr, string cmd, string data, integ | |||
440 | if ("SET " == llGetSubString(button, 0, 3)) | 440 | if ("SET " == llGetSubString(button, 0, 3)) |
441 | { | 441 | { |
442 | set = listFindString(Settings, fr + cmd, sSTRIDE); | 442 | set = listFindString(Settings, fr + cmd, sSTRIDE); |
443 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); | 443 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else S("Unknown setting '" + cmd); |
444 | } | 444 | } |
445 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; | 445 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; |
446 | 446 | ||
@@ -527,7 +527,7 @@ llShout(0, "AAAHHHHH!"); | |||
527 | } | 527 | } |
528 | else | 528 | else |
529 | { | 529 | { |
530 | D("Unknown CHOOSE_ALL option - " + button); | 530 | D("Unknown CHOOSE_ALL option - " + data); |
531 | return FALSE; | 531 | return FALSE; |
532 | } | 532 | } |
533 | sendScript(lSCAN, [id] + s); | 533 | sendScript(lSCAN, [id] + s); |
@@ -714,7 +714,7 @@ s("YAY! Freeeeeee at last!!!!!"); | |||
714 | osTeleportAgent(Owner, llList2String(TPtDestination, 1), llList2Vector(TPtDestination, 2), <1.0,1.0,1.0>); | 714 | osTeleportAgent(Owner, llList2String(TPtDestination, 1), llList2Vector(TPtDestination, 2), <1.0,1.0,1.0>); |
715 | } | 715 | } |
716 | else if ("TESTS" == cmd) | 716 | else if ("TESTS" == cmd) |
717 | s("selected test " + data); | 717 | S("selected test " + data); |
718 | else if ("URL" == cmd) | 718 | else if ("URL" == cmd) |
719 | { | 719 | { |
720 | URL = data; | 720 | URL = data; |
@@ -726,8 +726,8 @@ d("New URL " + URL); | |||
726 | ; | 726 | ; |
727 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) | 727 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) |
728 | { | 728 | { |
729 | if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); | 729 | if (fMENU == source) S("Unknown menu command '" + cmd + "' from - " + button); |
730 | else s("Unknown command '" + cmd + "' from - " + button); | 730 | else S("Unknown command '" + cmd + "' from - " + button); |
731 | } | 731 | } |
732 | return (source == fMENU); | 732 | return (source == fMENU); |
733 | } | 733 | } |
@@ -895,7 +895,7 @@ vector getRange(key this) | |||
895 | if (0 == llGetListLength(det)) | 895 | if (0 == llGetListLength(det)) |
896 | { | 896 | { |
897 | // Note - we can't use llGetObjectDetails() here, coz they might not be in adjacent sims either. | 897 | // Note - we can't use llGetObjectDetails() here, coz they might not be in adjacent sims either. |
898 | s("Can't find " + osKey2Name(this) + " in the sim."); | 898 | S("Can't find " + osKey2Name(this) + " in the sim."); |
899 | stopGoto(TRUE); | 899 | stopGoto(TRUE); |
900 | return ZERO_VECTOR; | 900 | return ZERO_VECTOR; |
901 | } | 901 | } |
@@ -1260,7 +1260,7 @@ string gotRLV(integer chan, integer g, string message) | |||
1260 | else | 1260 | else |
1261 | { | 1261 | { |
1262 | d("RLV command " + r + " not responding! Giving up."); | 1262 | d("RLV command " + r + " not responding! Giving up."); |
1263 | s("Your viewer is taking too long to start up RLV."); | 1263 | S("Your viewer is taking too long to start up RLV."); |
1264 | } | 1264 | } |
1265 | if (0 != h) llListenRemove(h); | 1265 | if (0 != h) llListenRemove(h); |
1266 | RLVq = llListReplaceList(RLVq, [], f, f + qSTRIDE - 1); | 1266 | RLVq = llListReplaceList(RLVq, [], f, f + qSTRIDE - 1); |
@@ -1307,12 +1307,12 @@ d("gotRLV @notify response - " + message); | |||
1307 | if (-1 == f) | 1307 | if (-1 == f) |
1308 | bl += [llList2String(RLVu, i)]; | 1308 | bl += [llList2String(RLVu, i)]; |
1309 | } | 1309 | } |
1310 | s("RLV started up in " + (string) (llGetTimeOfDay() - Start) + " seconds.\n" | 1310 | s("RLV started up in " + (string) (llGetTimeOfDay() - Start) + " seconds. " |
1311 | + llGetListLength(RLVa) + " RLV commands, " | 1311 | + llGetListLength(RLVa) + " RLV commands, " |
1312 | + llGetListLength(RLVb)+ " RLV black listed commands - " | 1312 | + llGetListLength(RLVb)+ " RLV black listed commands - " |
1313 | + llDumpList2String(RLVb, " / ")); | 1313 | + llDumpList2String(RLVb, " / ")); |
1314 | if (0 != llGetListLength(bl)) | 1314 | if (0 != llGetListLength(bl)) |
1315 | s("The following RLV commands are unsupported by your viewer, or blacklisted - " | 1315 | d("The following RLV commands are unsupported by your viewer, or blacklisted - " |
1316 | + llDumpList2String(bl, ", ") | 1316 | + llDumpList2String(bl, ", ") |
1317 | + "\nSome things may or may not work. That list may not be accurate."); | 1317 | + "\nSome things may or may not work. That list may not be accurate."); |
1318 | justRLV("notify:" + (RLVchannel - 1) + "=add"); | 1318 | justRLV("notify:" + (RLVchannel - 1) + "=add"); |
@@ -1368,7 +1368,7 @@ d("\n\n1ring sending RESET @ " + (string) Start + "\n"); | |||
1368 | { | 1368 | { |
1369 | if ((NULL_KEY != id) && ((llGetTimeOfDay() - Start) > 60.0)) | 1369 | if ((NULL_KEY != id) && ((llGetTimeOfDay() - Start) > 60.0)) |
1370 | { | 1370 | { |
1371 | s("Attach detected, and RLV didn't respond yet, resetting."); | 1371 | S("Attach detected, and RLV didn't respond yet, resetting."); |
1372 | // llResetScript(); | 1372 | // llResetScript(); |
1373 | } | 1373 | } |
1374 | } | 1374 | } |