aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-07-04 02:14:27 +1000
committeronefang2019-07-04 02:14:27 +1000
commit0d288bd1ca584d691a87407c6fee9b8aad0ccdfd (patch)
tree9f24c8a4a139caf0d1fc33442843ff343ad22e29
parentAdd a changelog. (diff)
download1ring-0d288bd1ca584d691a87407c6fee9b8aad0ccdfd.zip
1ring-0d288bd1ca584d691a87407c6fee9b8aad0ccdfd.tar.gz
1ring-0d288bd1ca584d691a87407c6fee9b8aad0ccdfd.tar.bz2
1ring-0d288bd1ca584d691a87407c6fee9b8aad0ccdfd.tar.xz
Don't complain about settings with no code to handle them.
-rw-r--r--1AOor2.lsl11
-rw-r--r--1ring.lsl14
2 files changed, 12 insertions, 13 deletions
diff --git a/1AOor2.lsl b/1AOor2.lsl
index 96ef48b..2097d7d 100644
--- a/1AOor2.lsl
+++ b/1AOor2.lsl
@@ -239,10 +239,11 @@ d("linky RESET_DONE");
239 239
240integer doThing(key id, string button, string fr, string cmd, string data, integer source) 240integer 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}
diff --git a/1ring.lsl b/1ring.lsl
index 9593321..7e59c45 100644
--- a/1ring.lsl
+++ b/1ring.lsl
@@ -406,11 +406,11 @@ integer changeAccess(key id, string cmd, key person, integer source)
406 406
407integer doThing(key id, string button, string fr, string cmd, string data, integer source) 407integer 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}