diff options
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 572ca07..d606b37 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -354,11 +354,29 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
354 | foreach (IScriptInstance instance in m_Scripts.Values) | 354 | foreach (IScriptInstance instance in m_Scripts.Values) |
355 | { | 355 | { |
356 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 356 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
357 | string status; | ||
358 | |||
359 | if (instance.ShuttingDown) | ||
360 | { | ||
361 | status = "shutting down"; | ||
362 | } | ||
363 | else if (instance.Suspended) | ||
364 | { | ||
365 | status = "suspended"; | ||
366 | } | ||
367 | else if (!instance.Running) | ||
368 | { | ||
369 | status = "stopped"; | ||
370 | } | ||
371 | else | ||
372 | { | ||
373 | status = "running"; | ||
374 | } | ||
357 | 375 | ||
358 | MainConsole.Instance.OutputFormat( | 376 | MainConsole.Instance.OutputFormat( |
359 | "{0}.{1}, script UUID {2}, prim UUID {3} @ {4}", | 377 | "{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})", |
360 | instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, | 378 | instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, |
361 | sop.AbsolutePosition, m_Scene.RegionInfo.RegionName); | 379 | sop.AbsolutePosition, status); |
362 | } | 380 | } |
363 | } | 381 | } |
364 | } | 382 | } |