diff options
author | Justin Clark-Casey (justincc) | 2011-10-19 20:24:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-19 20:24:07 +0100 |
commit | 116fbe8258e336be3f6ac1e11119214629799faa (patch) | |
tree | c014c6d455b900f1736f5b8eb4ca278f920b67b8 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Add "show scripts" command to show all scripts currently known to the script ... (diff) | |
download | opensim-SC-116fbe8258e336be3f6ac1e11119214629799faa.zip opensim-SC-116fbe8258e336be3f6ac1e11119214629799faa.tar.gz opensim-SC-116fbe8258e336be3f6ac1e11119214629799faa.tar.bz2 opensim-SC-116fbe8258e336be3f6ac1e11119214629799faa.tar.xz |
add current script status to "scripts show" command (running, suspended, etc.)
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 9f8ee1c..c74cd64 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -286,11 +286,29 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
286 | foreach (IScriptInstance instance in m_Scripts.Values) | 286 | foreach (IScriptInstance instance in m_Scripts.Values) |
287 | { | 287 | { |
288 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); | 288 | SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID); |
289 | string status; | ||
290 | |||
291 | if (instance.ShuttingDown) | ||
292 | { | ||
293 | status = "shutting down"; | ||
294 | } | ||
295 | else if (instance.Suspended) | ||
296 | { | ||
297 | status = "suspended"; | ||
298 | } | ||
299 | else if (!instance.Running) | ||
300 | { | ||
301 | status = "stopped"; | ||
302 | } | ||
303 | else | ||
304 | { | ||
305 | status = "running"; | ||
306 | } | ||
289 | 307 | ||
290 | MainConsole.Instance.OutputFormat( | 308 | MainConsole.Instance.OutputFormat( |
291 | "{0}.{1}, script UUID {2}, prim UUID {3} @ {4}", | 309 | "{0}.{1}, script UUID {2}, prim UUID {3} @ {4} ({5})", |
292 | instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, | 310 | instance.PrimName, instance.ScriptName, instance.AssetID, instance.ObjectID, |
293 | sop.AbsolutePosition, m_Scene.RegionInfo.RegionName); | 311 | sop.AbsolutePosition, status); |
294 | } | 312 | } |
295 | } | 313 | } |
296 | } | 314 | } |