New OhSilly Threat level detector, and actually use it.

Tries to work in all case.

1 files changed, 12 insertions, 30 deletions

diff --git a/1ring.lsl b/1ring.lsl
index 69dbc2e..9593321 100644
--- a/1ring.lsl
+++ b/1ring.lsl
@@ -56,20 +56,7 @@ integer lDYNAMIC            = -20;
 integer lMENU               = -21;
 
 // OhSillyThreat detector
-list OhSillyThreats = [];
-list OhSillyTreats =            // OpenSim threat level.
-[
-    "osKey2Name",               // low
-//    "osGetAvatarList",          // none
-//    "osGetNotecard",            // very high    (describes what they where when making this decision)
-//    "osMakeNotecard",           // high         (describes what they where when making this decision)
-//    "osGetRezzingObject",       // none
-    "osMessageObject",          // low
-//    "osAvatarPlayAnimation",    // very high
-//    "osAvatarStopAnimation",    // very high
-//    "osForceOtherSit",          // very high
-    "osSetSpeed"                // moderate
-];
+integer doSpeed = FALSE;
 
 d(string m) {if (DEBUG) llInstantMessage(Owner, llGetScriptName() + ": " + m);}
 D(string m) {llRegionSay(DEBUG_CHANNEL, llGetScriptName() + ": " + m);}
@@ -103,6 +90,8 @@ string inKey2Name(key k)
     return k;
 }
 
+speed(key u, float s){if (doSpeed)  osSetSpeed(u, s);}
+
 integer listFindString(list lst, string name, integer stride)
 {
     integer f = llListFindList(lst, [name]);
@@ -215,6 +204,10 @@ dynamicMenu(key id, string menu, string name, string title, string entries, stri
 
 linky(integer num, string message, key id)
 {
+    if (DEBUG_CHANNEL == num)
+    {
+        if ("osSetSpeed" == message)  doSpeed = (integer) id;
+    }
     if ((id != ScriptKey) && (id != NULL_KEY))  return;
     list    input = llParseStringKeepNulls(message, [lSEP], []);
     key them = llList2Key(input, 0);
@@ -266,19 +259,6 @@ d("linky RESET_DONE");
         laterInit();
         s("Finished starting up " + getSetting("VERSION") + " in " + (string) (llGetTimeOfDay() - Start));
     }
-    else if (DEBUG_CHANNEL == num)
-    {
-        key root =  llList2Key(llGetObjectDetails(id, [OBJECT_ROOT]), 0);
-        integer f = llListFindList(OhSillyThreats, [message]);
-
-        if (-1 == f)
-            OhSillyThreats += [message];
-        else
-            d("OhSillyThreats detected the function " + message + "() again!" );
-        s("Oh Silly threat system prevented " + message + "()"
-                     + "\n in      " + id   + " \t" + llKey2Name(id)
-                     + "\n part of " + root + " \t" + llKey2Name(root));
-    }
 }
 // END boilerplate, mostly.
 
@@ -629,6 +609,8 @@ s("YAY!  Freeeeeee at last!!!!!");
             osMessageObject(LeashKey, "URL|" + data);
 d("New URL " + URL);
     }
+    else if ("OHSILLYPROBE" == cmd)
+        llMessageLinked(LINK_SET, DEBUG_CHANNEL, "OHSILLYPROBE", llGetKey());
     else if ("▲" == cmd)
         ;
     else if (-1 == listFindString(Settings, fr + cmd, sSTRIDE))
@@ -853,9 +835,9 @@ goto(key this)
     if (dist > (RANGE + bb))
     {
         if (dist > (2.0 * (RANGE + bb)))
-            osSetSpeed(Owner, 2.0);
+            speed(Owner, 2.0);
         else
-            osSetSpeed(Owner, 1.0);
+            speed(Owner, 1.0);
 
         llStopMoveToTarget();
         if (0 != tid)
@@ -899,7 +881,7 @@ stopGoto(integer all)
         llTargetRemove(tid);  
         tid = 0;
     }
-    osSetSpeed(Owner, 1.0);
+    speed(Owner, 1.0);
     if (all)
     {
         Stalkee = NULL_KEY;