aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
diff options
context:
space:
mode:
authorTedd Hansen2007-08-22 19:33:10 +0000
committerTedd Hansen2007-08-22 19:33:10 +0000
commit4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f (patch)
tree2a05a2b6191cc8e483b9a1695d87e5d9338716aa /OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
parentAdded OnRemoveScript event handler to ScriptEngine. Fixed event queuing of em... (diff)
downloadopensim-SC-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.zip
opensim-SC-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.gz
opensim-SC-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.bz2
opensim-SC-4beef91d006ed18cb7dc4a6ee8f2dc4e2a71ab6f.tar.xz
GC.GetTotalMemory(true) was blocking.
We now support individual scripts on individual prims. Do the script dance... \o/ \o\ /o/ \o/ .o.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 4343ea1..a20a95a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
51 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager 51 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager
52 52
53 // Hook up a test event to our test form 53 // Hook up a test event to our test form
54 //myScriptEngine.Log.Verbose("ScriptEngine", "EventManager Hooking up to server events"); 54 myScriptEngine.Log.Verbose("ScriptEngine", "Hooking up to server events");
55 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start); 55 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start);
56 myScriptEngine.World.EventManager.OnRezScript += new OpenSim.Region.Environment.Scenes.EventManager.NewRezScript(OnRezScript); 56 myScriptEngine.World.EventManager.OnRezScript += new OpenSim.Region.Environment.Scenes.EventManager.NewRezScript(OnRezScript);
57 myScriptEngine.World.EventManager.OnRemoveScript += new OpenSim.Region.Environment.Scenes.EventManager.RemoveScript(OnRemoveScript); 57 myScriptEngine.World.EventManager.OnRemoveScript += new OpenSim.Region.Environment.Scenes.EventManager.RemoveScript(OnRemoveScript);
@@ -62,6 +62,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
62 { 62 {
63 // Add to queue for all scripts in ObjectID object 63 // Add to queue for all scripts in ObjectID object
64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start"); 64 //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start");
65 Console.WriteLine("touch_start localID: " + localID);
65 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 }); 66 myScriptEngine.myEventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] { (int)1 });
66 } 67 }
67 public void OnRezScript(uint localID, LLUUID itemID, string script) 68 public void OnRezScript(uint localID, LLUUID itemID, string script)
@@ -75,11 +76,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
75 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() 76 // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
76 //); 77 //);
77 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length); 78 Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + script.Length);
78 myScriptEngine.myScriptManager.StartScript( 79 myScriptEngine.myScriptManager.StartScript(localID, itemID, script);
79 localID,
80 itemID,
81 script
82 );
83 80
84 } 81 }
85 public void OnRemoveScript(uint localID, LLUUID itemID) 82 public void OnRemoveScript(uint localID, LLUUID itemID)