aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs28
1 files changed, 3 insertions, 25 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 8c7834a..b13ab21 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -137,32 +137,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
137 public uint localID; 137 public uint localID;
138 public UUID itemID; 138 public UUID itemID;
139 public string functionName; 139 public string functionName;
140 public Queue_llDetectParams_Struct llDetectParams; 140 public DetectParams[] llDetectParams;
141 public object[] param; 141 public object[] param;
142 } 142 }
143 143
144 /// <summary>
145 /// Shared empty llDetectNull
146 /// </summary>
147 public readonly static Queue_llDetectParams_Struct llDetectNull = new Queue_llDetectParams_Struct();
148
149 /// <summary>
150 /// Structure to hold data for llDetect* commands
151 /// </summary>
152 [Serializable]
153 public struct Queue_llDetectParams_Struct
154 {
155 // More or less just a placeholder for the actual moving of additional data
156 // should be fixed to something better :)
157 public LSL_Types.key[] _key; // detected key
158 public LSL_Types.key[] _key2; // ownerkey
159 public LSL_Types.Quaternion[] _Quaternion;
160 public LSL_Types.Vector3[] _Vector3; // Pos
161 public LSL_Types.Vector3[] _Vector32; // Vel
162 public bool[] _bool;
163 public int[] _int;
164 public string[] _string;
165 }
166 #endregion 144 #endregion
167 145
168 #region " Initialization / Startup " 146 #region " Initialization / Startup "
@@ -322,7 +300,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
322 /// <param name="localID">Region object ID</param> 300 /// <param name="localID">Region object ID</param>
323 /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param> 301 /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param>
324 /// <param name="param">Array of parameters to match event mask</param> 302 /// <param name="param">Array of parameters to match event mask</param>
325 public bool AddToObjectQueue(uint localID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) 303 public bool AddToObjectQueue(uint localID, string FunctionName, DetectParams[] qParams, params object[] param)
326 { 304 {
327 // Determine all scripts in Object and add to their queue 305 // Determine all scripts in Object and add to their queue
328 //myScriptEngine.log.Info("[" + ScriptEngineName + "]: EventQueueManager Adding localID: " + localID + ", FunctionName: " + FunctionName); 306 //myScriptEngine.log.Info("[" + ScriptEngineName + "]: EventQueueManager Adding localID: " + localID + ", FunctionName: " + FunctionName);
@@ -353,7 +331,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
353 /// <param name="itemID">Region script ID</param> 331 /// <param name="itemID">Region script ID</param>
354 /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param> 332 /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param>
355 /// <param name="param">Array of parameters to match event mask</param> 333 /// <param name="param">Array of parameters to match event mask</param>
356 public bool AddToScriptQueue(uint localID, UUID itemID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) 334 public bool AddToScriptQueue(uint localID, UUID itemID, string FunctionName, DetectParams[] qParams, params object[] param)
357 { 335 {
358 List<UUID> keylist = m_ScriptEngine.m_ScriptManager.GetScriptKeys(localID); 336 List<UUID> keylist = m_ScriptEngine.m_ScriptManager.GetScriptKeys(localID);
359 337