aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-12 19:42:04 +0100
committerJustin Clark-Casey (justincc)2011-10-12 19:42:04 +0100
commitea7366ddc6f0e13519589fcaa3729fd36b5eef79 (patch)
treec490982c51a632d3a06f015fabb75bd2e3c2ba92
parentminor: insert some commented out log lines which are a blunt but useful instr... (diff)
downloadopensim-SC_OLD-ea7366ddc6f0e13519589fcaa3729fd36b5eef79.zip
opensim-SC_OLD-ea7366ddc6f0e13519589fcaa3729fd36b5eef79.tar.gz
opensim-SC_OLD-ea7366ddc6f0e13519589fcaa3729fd36b5eef79.tar.bz2
opensim-SC_OLD-ea7366ddc6f0e13519589fcaa3729fd36b5eef79.tar.xz
When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
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 6e9f3ec..3313b18 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
678 m_CollisionInQueue = false; 678 m_CollisionInQueue = false;
679 } 679 }
680 680
681 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); 681 //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
682 682
683 m_DetectParams = data.DetectParams; 683 m_DetectParams = data.DetectParams;
684 684
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 156fd57..f6afcdb 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -271,6 +271,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
271 { 271 {
272 lock (m_Scripts) 272 lock (m_Scripts)
273 { 273 {
274 m_log.InfoFormat(
275 "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
276
274 foreach (IScriptInstance instance in m_Scripts.Values) 277 foreach (IScriptInstance instance in m_Scripts.Values)
275 { 278 {
276 // Force a final state save 279 // Force a final state save
@@ -1008,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1008 1011
1009 IScriptInstance instance = (ScriptInstance) parms; 1012 IScriptInstance instance = (ScriptInstance) parms;
1010 1013
1011 //m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); 1014 //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
1012 1015
1013 return instance.EventProcessor(); 1016 return instance.EventProcessor();
1014 } 1017 }