2 files changed, 36 insertions, 10 deletions

diff --git a/LuaSL/src/LSL.lua b/LuaSL/src/LSL.lua
index 0b02077..975f219 100644
--- a/LuaSL/src/LSL.lua
+++ b/LuaSL/src/LSL.lua
@@ -335,16 +335,40 @@ function LSL.stateChange(x)
   end
 end;
 
-function LSL.mainLoop(x)
+function LSL.mainLoop(SID, x)
+  -- TODO - disabled the stuff that waits until I implement the stuff that makes it stop waiting.  lol
+  local sid = SID .. ".events"
+  local status, errorMsg = "disabled" -- = luaproc.newchannel(sid)
+  local result
+
+  if not status then
+    print("Can't open the luaproc channel " .. sid .. "  ERROR MESSAGE: " .. errorMsg)
+    return
+  end
+
   LSL.stateChange(x);
-  --[[    TODO -
-          Sits around waiting for events.  This should be "wait for a message" in luaproc.
-            Incoming events can be the same format as the OpenSim SID.event.* protocol on the wiki.
-            When we get an event, run it, then go back to waiting.
-
-          Need a FIFO stack of incoming events.
-            Which will be in the C main thread, coz that's listening on the socket for us.
-    ]]
+
+  -- TODO - Need a FIFO stack of incoming events.  Which will be in the C main thread, coz that's listening on the socket for us.
+
+--  while true do
+    local message = luaproc.receive(sid)
+    if message then
+      result, errorMsg = loadstring(message)
+      if nil == result then
+        print("Not a valid event: " .. message .. "  ERROR MESSAGE: " .. errorMsg)
+      else
+        status, result = pcall(result())
+        if not status then
+          print("Error from event: " .. message .. "  ERROR MESSAGE: " .. result)
+        elseif result then
+          status, errorMsg = luaproc.send(sid, result)
+          if not status then
+            print("Error sending results from event: " .. message .. "  ERROR MESSAGE: " .. errorMsg)
+          end
+        end
+      end
+    end
+--  end
 end
 
 -- Typecasting stuff.
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 80eda62..4821589 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -2276,8 +2276,10 @@ boolean compileLSL(gameGlobals *game, char *script, boolean doConstants)
                 fprintf(out, "--// Generated code goes here.\n\n");
                 fprintf(out, "local _bit = require(\"bit\")\n");
                 fprintf(out, "local _LSL = require(\"LSL\")\n\n");
+                // TODO - Use the scripts UUID instead of the file name here.
+                fprintf(out, "local _SID = [=[%s]=]\n\n", compiler.fileName);
                 outputLeaf(out, OM_LUA, compiler.ast);
-                fprintf(out, "\n\n_LSL.mainLoop(_defaultState)\n");  // This actually starts the script running.
+                fprintf(out, "\n\n_LSL.mainLoop(_SID, _defaultState)\n");  // This actually starts the script running.
                 fprintf(out, "\n--// End of generated code.\n\n");
                 fclose(out);