Mantis #2350

Move the DotNetEngine Unloading script debug message

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
             if (id == null)
                 return;
 
+            m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
+                    m_scriptEngine.ScriptEngineName);
+
             // Stop long command on script
             AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
 
@@ -371,8 +374,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
                     if (item.Action == LUType.Unload)
                     {
-                        m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
-                                m_scriptEngine.ScriptEngineName);
                         _StopScript(item.localID, item.itemID);
                         RemoveScript(item.localID, item.itemID);
                     }
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
 
                     if (item.Action == LoadUnloadStructure.LUType.Unload)
                     {
-                        m_log.DebugFormat("[{0}] Unloading script", Name);
-                        _StopScript(item.Script.LocalID, item.Script.ItemID);
+                         _StopScript(item.Script.LocalID, item.Script.ItemID);
                         RemoveScript(item.Script.LocalID, item.Script.ItemID);
                     }
                     else if (item.Action == LoadUnloadStructure.LUType.Load)
@@ -254,6 +253,8 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
             if (!TryGetScript(localID, itemID, ref ss))
                 return;
 
+            m_log.DebugFormat("[{0}] Unloading script", Name);
+
             // Stop long command on script
             //AsyncCommandManager.RemoveScript(ss);