diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 5c57874..1a08795 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase |
34 | { | 34 | { |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
134 | public struct QueueItemStruct | 134 | public struct QueueItemStruct |
135 | { | 135 | { |
136 | public uint localID; | 136 | public uint localID; |
137 | public LLUUID itemID; | 137 | public UUID itemID; |
138 | public string functionName; | 138 | public string functionName; |
139 | public Queue_llDetectParams_Struct llDetectParams; | 139 | public Queue_llDetectParams_Struct llDetectParams; |
140 | public object[] param; | 140 | public object[] param; |
@@ -308,10 +308,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
308 | return; | 308 | return; |
309 | } | 309 | } |
310 | 310 | ||
311 | Dictionary<LLUUID, IScript>.KeyCollection scriptKeys = | 311 | Dictionary<UUID, IScript>.KeyCollection scriptKeys = |
312 | m_ScriptEngine.m_ScriptManager.GetScriptKeys(localID); | 312 | m_ScriptEngine.m_ScriptManager.GetScriptKeys(localID); |
313 | 313 | ||
314 | foreach (LLUUID itemID in scriptKeys) | 314 | foreach (UUID itemID in scriptKeys) |
315 | { | 315 | { |
316 | // Add to each script in that object | 316 | // Add to each script in that object |
317 | // TODO: Some scripts may not subscribe to this event. Should we NOT add it? Does it matter? | 317 | // TODO: Some scripts may not subscribe to this event. Should we NOT add it? Does it matter? |
@@ -326,7 +326,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
326 | /// <param name="itemID">Region script ID</param> | 326 | /// <param name="itemID">Region script ID</param> |
327 | /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param> | 327 | /// <param name="FunctionName">Name of the function, will be state + "_event_" + FunctionName</param> |
328 | /// <param name="param">Array of parameters to match event mask</param> | 328 | /// <param name="param">Array of parameters to match event mask</param> |
329 | public void AddToScriptQueue(uint localID, LLUUID itemID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) | 329 | public void AddToScriptQueue(uint localID, UUID itemID, string FunctionName, Queue_llDetectParams_Struct qParams, params object[] param) |
330 | { | 330 | { |
331 | lock (eventQueue) | 331 | lock (eventQueue) |
332 | { | 332 | { |