From 6055db2bc3beadcfd3e06c74b0fffb42ae4545a7 Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sun, 30 Dec 2007 22:37:07 +0000
Subject: server->script event path almost ready for remote scriptengine
 (translation table between local script ID and remote script ID missing)

---
 .../ScriptEngine/RemoteServer/EventManager.cs      | 84 ++++++++++++----------
 1 file changed, 45 insertions(+), 39 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs')

diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
index b4ac615..f0a3aa1 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/EventManager.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
     internal class EventManager
     {
 
-        System.Collections.Generic.Dictionary<uint, EventManager> remoteScript = new System.Collections.Generic.Dictionary<uint, EventManager>();
+        System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject> remoteScript = new System.Collections.Generic.Dictionary<uint, OpenSim.Grid.ScriptServer.RemotingObject>();
 
 
         private ScriptEngine myScriptEngine;
@@ -47,179 +47,185 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
             myScriptEngine = _ScriptEngine;
 
             myScriptEngine.Log.Verbose("RemoteEngine", "Hooking up to server events");
-            myScriptEngine.World.EventManager.OnObjectGrab += touch_start;
+            //myScriptEngine.World.EventManager.OnObjectGrab += touch_start;
             myScriptEngine.World.EventManager.OnRezScript += OnRezScript;
-            myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript;
+            //myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript;
+
+
         }
 
-        public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
+
+        public void OnRezScript(uint localID, LLUUID itemID, string script)
         {
-            remoteScript[localID].touch_start(localID, offsetPos, remoteClient);
+            // WE ARE CREATING A NEW SCRIPT ... CREATE SCRIPT, GET A REMOTEID THAT WE MAP FROM LOCALID
+            OpenSim.Grid.ScriptServer.RemotingObject obj = myScriptEngine.m_RemoteServer.Connect("localhost", 1234);
+            remoteScript.Add(localID, obj);
+            remoteScript[localID].ScriptEngine.m_EventManager.OnRezScript(localID, itemID, script);
         }
 
-        public void OnRezScript(uint localID, LLUUID itemID, string script)
+        public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
         {
-            remoteScript[localID].OnRezScript(localID, itemID, script);
+            remoteScript[localID].ScriptEngine.m_EventManager.touch_start(localID, offsetPos, remoteClient);
         }
 
         public void OnRemoveScript(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].OnRemoveScript(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.OnRemoveScript(localID, itemID);
         }
 
         public void state_exit(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].state_exit(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.state_exit(localID, itemID);
         }
 
         public void touch(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].touch(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.touch(localID, itemID);
         }
 
         public void touch_end(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].touch_end(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.touch_end(localID, itemID);
         }
 
         public void collision_start(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].collision_start(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.collision_start(localID, itemID);
         }
 
         public void collision(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].collision(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.collision(localID, itemID);
         }
 
         public void collision_end(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].collision_end(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.collision_end(localID, itemID);
         }
 
         public void land_collision_start(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].land_collision_start(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.land_collision_start(localID, itemID);
         }
 
         public void land_collision(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].land_collision(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.land_collision(localID, itemID);
         }
 
         public void land_collision_end(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].land_collision_end(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.land_collision_end(localID, itemID);
         }
 
         public void timer(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].timer(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.timer(localID, itemID);
         }
 
         public void listen(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].listen(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.listen(localID, itemID);
         }
 
         public void on_rez(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].on_rez(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.on_rez(localID, itemID);
         }
 
         public void sensor(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].sensor(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.sensor(localID, itemID);
         }
 
         public void no_sensor(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].no_sensor(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.no_sensor(localID, itemID);
         }
 
         public void control(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].control(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.control(localID, itemID);
         }
 
         public void money(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].money(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.money(localID, itemID);
         }
 
         public void email(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].email(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.email(localID, itemID);
         }
 
         public void at_target(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].at_target(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.at_target(localID, itemID);
         }
 
         public void not_at_target(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].not_at_target(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.not_at_target(localID, itemID);
         }
 
         public void at_rot_target(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].at_rot_target(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.at_rot_target(localID, itemID);
         }
 
         public void not_at_rot_target(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].not_at_rot_target(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.not_at_rot_target(localID, itemID);
         }
 
         public void run_time_permissions(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].run_time_permissions(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.run_time_permissions(localID, itemID);
         }
 
         public void changed(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].changed(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.changed(localID, itemID);
         }
 
         public void attach(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].attach(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.attach(localID, itemID);
         }
 
         public void dataserver(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].dataserver(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.dataserver(localID, itemID);
         }
 
         public void link_message(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].link_message(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.link_message(localID, itemID);
         }
 
         public void moving_start(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].moving_start(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.moving_start(localID, itemID);
         }
 
         public void moving_end(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].moving_end(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.moving_end(localID, itemID);
         }
 
         public void object_rez(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].object_rez(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.object_rez(localID, itemID);
         }
 
         public void remote_data(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].remote_data(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.remote_data(localID, itemID);
         }
 
         public void http_response(uint localID, LLUUID itemID)
         {
-            remoteScript[localID].http_response(localID, itemID);
+            remoteScript[localID].ScriptEngine.m_EventManager.http_response(localID, itemID);
         }
 
     }
-- 
cgit v1.1