OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis #2350 

Move the DotNetEngine Unloading script debug message
0.6.1-post-fixes
idb 2008-12-05 12:30:50 +00:00
parent 2cb30b3435
commit e56f918b17
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -258,6 +258,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (id == null) if (id == null)
return; return;
m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
m_scriptEngine.ScriptEngineName);
// Stop long command on script // Stop long command on script
AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID); AsyncCommandManager.RemoveScript(m_scriptEngine, localID, itemID);
@ -371,8 +374,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
if (item.Action == LUType.Unload) if (item.Action == LUType.Unload)
{ {
m_scriptEngine.Log.DebugFormat("[{0}]: Unloading script",
m_scriptEngine.ScriptEngineName);
_StopScript(item.localID, item.itemID); _StopScript(item.localID, item.itemID);
RemoveScript(item.localID, item.itemID); RemoveScript(item.localID, item.itemID);
} }

5
OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/ScriptManager_ScriptLoadUnload.cs
View File

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