aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs5
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs5
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index f9f6401..2631867 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -258,6 +258,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
258 if (id == null) 258 if (id == null)
259 return; 259 return;
260 260
261 m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
262 m_scriptEngine.ScriptEngineName);
263
261 // Stop long command on script 264 // Stop long command on script
262 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID); 265 AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
263 266
@@ -371,8 +374,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
371 374
372 if (item.Action == LUType.Unload) 375 if (item.Action == LUType.Unload)
373 { 376 {
374 m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
375 m_scriptEngine.ScriptEngineName);
376 _StopScript(item.localID, item.itemID); 377 _StopScript(item.localID, item.itemID);
377 RemoveScript(item.localID, item.itemID); 378 RemoveScript(item.localID, item.itemID);
378 } 379 }
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
index e657f32..e70cb91 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
@@ -106,8 +106,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
106 106
107 if (item.Action == LoadUnloadStructure.LUType.Unload) 107 if (item.Action == LoadUnloadStructure.LUType.Unload)
108 { 108 {
109 m_log.DebugFormat("[{0}] Unloading script", Name); 109 _StopScript(item.Script.LocalID, item.Script.ItemID);
110 _StopScript(item.Script.LocalID, item.Script.ItemID);
111 RemoveScript(item.Script.LocalID, item.Script.ItemID); 110 RemoveScript(item.Script.LocalID, item.Script.ItemID);
112 } 111 }
113 else if (item.Action == LoadUnloadStructure.LUType.Load) 112 else if (item.Action == LoadUnloadStructure.LUType.Load)
@@ -254,6 +253,8 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
254 if (!TryGetScript(localID, itemID, ref ss)) 253 if (!TryGetScript(localID, itemID, ref ss))
255 return; 254 return;
256 255
256 m_log.DebugFormat("[{0}] Unloading script", Name);
257
257 // Stop long command on script 258 // Stop long command on script
258 //AsyncCommandManager.RemoveScript(ss); 259 //AsyncCommandManager.RemoveScript(ss);
259 260