aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-19 21:43:23 +0000
committerJustin Clark-Casey (justincc)2012-03-19 21:43:23 +0000
commit437f18bc4149517d169bf1abd8295b9be28abbb1 (patch)
tree86c3919bc3f338df054f5544ab186e1c7518d5bc /OpenSim
parentMove startup/shutdown command .txt files to .txt.example files to avoid clobb... (diff)
downloadopensim-SC_OLD-437f18bc4149517d169bf1abd8295b9be28abbb1.zip
opensim-SC_OLD-437f18bc4149517d169bf1abd8295b9be28abbb1.tar.gz
opensim-SC_OLD-437f18bc4149517d169bf1abd8295b9be28abbb1.tar.bz2
opensim-SC_OLD-437f18bc4149517d169bf1abd8295b9be28abbb1.tar.xz
Stop console command "xengine status" throwing an exception if there are no scripts in a region.
Addresses http://opensimulator.org/mantis/view.php?id=5940
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index d4108d7..7712076 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -401,16 +401,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
401// sb.AppendFormat("Assemblies loaded : {0}\n", m_Assemblies.Count); 401// sb.AppendFormat("Assemblies loaded : {0}\n", m_Assemblies.Count);
402 402
403 SensorRepeat sr = AsyncCommandManager.GetSensorRepeatPlugin(this); 403 SensorRepeat sr = AsyncCommandManager.GetSensorRepeatPlugin(this);
404 sb.AppendFormat("Sensors : {0}\n", sr.SensorsCount); 404 sb.AppendFormat("Sensors : {0}\n", sr != null ? sr.SensorsCount : 0);
405 405
406 Dataserver ds = AsyncCommandManager.GetDataserverPlugin(this); 406 Dataserver ds = AsyncCommandManager.GetDataserverPlugin(this);
407 sb.AppendFormat("Dataserver requests : {0}\n", ds.DataserverRequestsCount); 407 sb.AppendFormat("Dataserver requests : {0}\n", ds != null ? ds.DataserverRequestsCount : 0);
408 408
409 Timer t = AsyncCommandManager.GetTimerPlugin(this); 409 Timer t = AsyncCommandManager.GetTimerPlugin(this);
410 sb.AppendFormat("Timers : {0}\n", t.TimersCount); 410 sb.AppendFormat("Timers : {0}\n", t != null ? t.TimersCount : 0);
411 411
412 Listener l = AsyncCommandManager.GetListenerPlugin(this); 412 Listener l = AsyncCommandManager.GetListenerPlugin(this);
413 sb.AppendFormat("Listeners : {0}\n", l.ListenerCount); 413 sb.AppendFormat("Listeners : {0}\n", l != null ? l.ListenerCount : 0);
414 414
415 return sb.ToString(); 415 return sb.ToString();
416 } 416 }