From b342fb9c0a308cd9d881e87022fbf4fb2ff4bd10 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 12 Oct 2011 19:42:04 +0100 Subject: [PATCH] When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting. --- .../Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 6e9f3ecf9d..3313b1813c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -678,7 +678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance m_CollisionInQueue = false; } - //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); + //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this); m_DetectParams = data.DetectParams; diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 156fd579dc..f6afcdb134 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -271,6 +271,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine { lock (m_Scripts) { + m_log.InfoFormat( + "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName); + foreach (IScriptInstance instance in m_Scripts.Values) { // Force a final state save @@ -1008,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine IScriptInstance instance = (ScriptInstance) parms; - //m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); + //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance); return instance.EventProcessor(); }