From 0d288bd1ca584d691a87407c6fee9b8aad0ccdfd Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 4 Jul 2019 02:14:27 +1000 Subject: Don't complain about settings with no code to handle them. --- 1AOor2.lsl | 11 ++++++----- 1ring.lsl | 14 ++++++-------- 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"); integer doThing(key id, string button, string fr, string cmd, string data, integer source) { + integer set = -1; if ("Set " == llGetSubString(button, 0, 3)) { - integer set = listFindString(Settings, fr + cmd, sSTRIDE); - if (-1 != set) setSetting(id, fr + cmd, data, fINT); + set = listFindString(Settings, fr + cmd, sSTRIDE); + if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); } if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; integer st = findSitter(id); @@ -569,10 +570,10 @@ d("New URL " + URL); } } } - else if (-1 == listFindString(Settings, fr + cmd, sSTRIDE)) + else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) { - if (fMENU == source) d("Unknown menu command '" + cmd + "' from - " + button); - else d("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); } 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) integer doThing(key id, string button, string fr, string cmd, string data, integer source) { + integer set = -1; if ("SET " == llGetSubString(button, 0, 3)) { - integer set = listFindString(Settings, fr + cmd, sSTRIDE); - if (-1 != set) - setSetting(id, fr + cmd, data, fINT); + set = listFindString(Settings, fr + cmd, sSTRIDE); + if (-1 != set) setSetting(id, fr + cmd, data, fINT); else s("Unknown setting '" + cmd); } if ((fr != (ScriptName + ".") && ("*." != fr))) return TRUE; @@ -613,12 +613,10 @@ d("New URL " + URL); llMessageLinked(LINK_SET, DEBUG_CHANNEL, "OHSILLYPROBE", llGetKey()); else if ("▲" == cmd) ; - else if (-1 == listFindString(Settings, fr + cmd, sSTRIDE)) + else if ((-1 == listFindString(Settings, fr + cmd, sSTRIDE)) && (-1 != set)) { - if (fMENU == source) - d("Unknown menu command '" + cmd + "' from -\n\t" + button); - else - d("Unknown command '" + cmd + "' from -\n\t" + button); + if (fMENU == source) s("Unknown menu command '" + cmd + "' from - " + button); + else s("Unknown command '" + cmd + "' from - " + button); } return (source == fMENU); } -- cgit v1.1