Various bits and clean ups.

1 files changed, 7 insertions, 3 deletions

diff --git a/1chatter.lsl b/1chatter.lsl
index 8ce9237..5a7652d 100644
--- a/1chatter.lsl
+++ b/1chatter.lsl
@@ -1402,10 +1402,10 @@ fr="1AOor2";
                 Menus = wipe(Menus, fr, mSTRIDE);
                 Musers = wipe(Musers, fr, uSTRIDE, uSTACK);
                 Settings = wipe(Settings, fr, sSTRIDE);
-                readTheme(fr);
                 Settings = saveThing(Settings, sSTRIDE, ["PREFIX",    "S", fr,   aALL], 4, fr + ".");
                 Settings = saveThing(Settings, sSTRIDE, ["SCRIPTKEY", "K", them, aALL], 4, fr + ".");
                 Settings = saveThing(Settings, sSTRIDE, ["VERSION",   "S", "",   aALL], 4, fr + ".");
+                readTheme(fr);
                 sendScript(them, lALIAS_DONE, Aliases);
                 sendScript(them, lRESET_DONE, Settings);
                 sendScript(them, lCMD, "*.", [fHTTP, ScriptKey, URL_REQUEST_GRANTED, "URL", URL]);
@@ -1650,8 +1650,12 @@ d("listen 1ring.CHANNEL " + message + " -> " + button + " " + cmd + " " + data);
                 list dt = llParseString2List(llList2String(t, 1), [" "], []);
                 string cmd = llList2String(dt, 0);
                 dt = llListReplaceList(dt, [], 0, 0);
-//d("timer " + script + "->" + fr + " ... " + cmd + "=" + llDumpList2String(dt, " "));
-                sendScript(them, lCMD, fr + ".", [fINT, them, "TimerEvent", cmd, llDumpList2String(dt, " ")]);
+d("timer " + script + "->" + fr + " ... " + cmd + "=" + llDumpList2String(dt, " ") + "  " + them);
+                if (them == ScriptKey)
+//integer doThing(key id, string command, string fr, string cmd, string data, integer source)
+                    doThing(them, cmd, "*.", cmd, "", fINT);
+                else
+                    sendScript(them, lCMD, fr + ".", [fINT, them, "TimerEvent", cmd, llDumpList2String(dt, " ")]);
             }
         }
         llSetTimerEvent(NextEvent - now);