Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

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
                 foreach (IScriptInstance instance in m_Scripts.Values)
                 {
                     SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
+                    string status;
+
+                    if (instance.ShuttingDown)
+                    {
+                        status = "shutting down";
+                    }
+                    else if (instance.Suspended)
+                    {
+                        status = "suspended";
+                    }
+                    else if (!instance.Running)
+                    {
+                        status = "stopped";
+                    }
+                    else
+                    {
+                        status = "running";
+                    }
 
                     MainConsole.Instance.OutputFormat(
-                        "{0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
+                        "{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})",
                         instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID,
-                        sop.AbsolutePosition, m_Scene.RegionInfo.RegionName);
+                        sop.AbsolutePosition, status);
                 }
             }
         }