diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 5bdc753..9a9eba7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -33,6 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Environment.Scenes; |
34 | using OpenSim.Region.ScriptEngine.Common; | 34 | using OpenSim.Region.ScriptEngine.Common; |
35 | using OpenSim.Region.ScriptEngine.Shared; | 35 | using OpenSim.Region.ScriptEngine.Shared; |
36 | using OpenSim.Region.ScriptEngine.Shared.Api; | ||
36 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; | 37 | using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; |
37 | 38 | ||
38 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 39 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
@@ -139,10 +140,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
139 | // Fire the first start-event | 140 | // Fire the first start-event |
140 | int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); | 141 | int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); |
141 | m_host.SetScriptEvents(itemID, eventFlags); | 142 | m_host.SetScriptEvents(itemID, eventFlags); |
142 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); | 143 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", new DetectParams[0], new object[] { }); |
143 | if (postOnRez) | 144 | if (postOnRez) |
144 | { | 145 | { |
145 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(startParam) }); | 146 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", new DetectParams[0], new object[] { new LSL_Types.LSLInteger(startParam) }); |
146 | } | 147 | } |
147 | } | 148 | } |
148 | catch (Exception e) // LEGIT: User Scripting | 149 | catch (Exception e) // LEGIT: User Scripting |
@@ -174,7 +175,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
174 | //#endif | 175 | //#endif |
175 | 176 | ||
176 | // Stop long command on script | 177 | // Stop long command on script |
177 | m_scriptEngine.m_ASYNCLSLCommandManager.RemoveScript(localID, itemID); | 178 | AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID); |
178 | 179 | ||
179 | IScript LSLBC = GetScript(localID, itemID); | 180 | IScript LSLBC = GetScript(localID, itemID); |
180 | if (LSLBC == null) | 181 | if (LSLBC == null) |