diff options
-rw-r--r-- | 1AOor2.lsl | 11 | ||||
-rw-r--r-- | 1ring.lsl | 14 |
2 files changed, 12 insertions, 13 deletions
@@ -239,10 +239,11 @@ d("linky RESET_DONE"); | |||
239 | 239 | ||
240 | integer doThing(key id, string button, string fr, string cmd, string data, integer source) | 240 | integer doThing(key id, string button, string fr, string cmd, string data, integer source) |
241 | { | 241 | { |
242 | integer set = -1; | ||
242 | if ("Set " == llGetSubString(button, 0, 3)) | 243 | if ("Set " == llGetSubString(button, 0, 3)) |
243 | { | 244 | { |
244 | integer set = listFindString(Settings, fr + cmd, sSTRIDE); | 245 | set = listFindString(Settings, fr + cmd, sSTRIDE); |
245 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); | 246 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); |
246 | } | 247 | } |
247 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; | 248 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; |
248 | integer st = findSitter(id); | 249 | integer st = findSitter(id); |
@@ -569,10 +570,10 @@ d("New URL " + URL); | |||
569 | } | 570 | } |
570 | } | 571 | } |
571 | } | 572 | } |
572 | else if (-1 == listFindString(Settings, fr + cmd, sSTRIDE)) | 573 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) |
573 | { | 574 | { |
574 | if (fMENU == source) d("Unknown menu command '" + cmd + "' from - " + button); | 575 | if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); |
575 | else d("Unknown command '" + cmd + "' from - " + button); | 576 | else s("Unknown command '" + cmd + "' from - " + button); |
576 | } | 577 | } |
577 | return (source == fMENU); | 578 | return (source == fMENU); |
578 | } | 579 | } |
@@ -406,11 +406,11 @@ integer changeAccess(key id, string cmd, key person, integer source) | |||
406 | 406 | ||
407 | integer doThing(key id, string button, string fr, string cmd, string data, integer source) | 407 | integer doThing(key id, string button, string fr, string cmd, string data, integer source) |
408 | { | 408 | { |
409 | integer set = -1; | ||
409 | if ("SET " == llGetSubString(button, 0, 3)) | 410 | if ("SET " == llGetSubString(button, 0, 3)) |
410 | { | 411 | { |
411 | integer set = listFindString(Settings, fr + cmd, sSTRIDE); | 412 | set = listFindString(Settings, fr + cmd, sSTRIDE); |
412 | if (-1 != set) | 413 | if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); |
413 | setSetting(id, fr + cmd, data, fINT); | ||
414 | } | 414 | } |
415 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; | 415 | if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; |
416 | 416 | ||
@@ -613,12 +613,10 @@ d("New URL " + URL); | |||
613 | llMessageLinked(LINK_SET, DEBUG_CHANNEL, "OHSILLYPROBE", llGetKey()); | 613 | llMessageLinked(LINK_SET, DEBUG_CHANNEL, "OHSILLYPROBE", llGetKey()); |
614 | else if ("▲" == cmd) | 614 | else if ("▲" == cmd) |
615 | ; | 615 | ; |
616 | else if (-1 == listFindString(Settings, fr + cmd, sSTRIDE)) | 616 | else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) |
617 | { | 617 | { |
618 | if (fMENU == source) | 618 | if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); |
619 | d("Unknown menu command '" + cmd + "' from -\n\t" + button); | 619 | else s("Unknown command '" + cmd + "' from - " + button); |
620 | else | ||
621 | d("Unknown command '" + cmd + "' from -\n\t" + button); | ||
622 | } | 620 | } |
623 | return (source == fMENU); | 621 | return (source == fMENU); |
624 | } | 622 | } |