diff options
author | Tedd Hansen | 2007-08-17 21:24:38 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-17 21:24:38 +0000 |
commit | fcf7db72728174a628e62ae9d98a3c0090217728 (patch) | |
tree | 2eb9138fd0c0cfb46aa44c74cb8cda75fce40f92 /OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | |
parent | Removed RAIL test from startup for now... (diff) | |
download | opensim-SC-fcf7db72728174a628e62ae9d98a3c0090217728.zip opensim-SC-fcf7db72728174a628e62ae9d98a3c0090217728.tar.gz opensim-SC-fcf7db72728174a628e62ae9d98a3c0090217728.tar.bz2 opensim-SC-fcf7db72728174a628e62ae9d98a3c0090217728.tar.xz |
Pimped up Default.lsl. Now featuring a touch counter.
Changed "ObjectID" in ScriptEngine to IScriptHost reference. Events will now be queued based on IScriptHost reference instead of string ID of object. Removed "root" object reference in script.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs index a5eff7d..a63aad9 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Threading; | 32 | using System.Threading; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 36 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
36 | { | 37 | { |
@@ -45,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
45 | private Queue<QueueItemStruct> EventQueue = new Queue<QueueItemStruct>(); | 46 | private Queue<QueueItemStruct> EventQueue = new Queue<QueueItemStruct>(); |
46 | private struct QueueItemStruct | 47 | private struct QueueItemStruct |
47 | { | 48 | { |
48 | public string ObjectID; | 49 | public IScriptHost ObjectID; |
49 | public string ScriptID; | 50 | public string ScriptID; |
50 | public string FunctionName; | 51 | public string FunctionName; |
51 | public object[] param; | 52 | public object[] param; |
@@ -109,7 +110,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
109 | } | 110 | } |
110 | } | 111 | } |
111 | 112 | ||
112 | public void AddToObjectQueue(string ObjectID, string FunctionName, object[] param) | 113 | public void AddToObjectQueue(IScriptHost ObjectID, string FunctionName, object[] param) |
113 | { | 114 | { |
114 | // Determine all scripts in Object and add to their queue | 115 | // Determine all scripts in Object and add to their queue |
115 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Adding ObjectID: " + ObjectID + ", FunctionName: " + FunctionName); | 116 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Adding ObjectID: " + ObjectID + ", FunctionName: " + FunctionName); |