diff options
Diffstat (limited to '')
-rw-r--r-- | 1ring.lsl | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -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 | } |