From 6235d16c3148bb6f9f881b0dc286deccfdf9148a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 31 Oct 2012 00:31:18 +0000
Subject: Make "show object part" command correctly display script status.

Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
---
 .../Framework/Scenes/SceneObjectPartInventory.cs   | 52 +++++++++++++++-------
 1 file changed, 35 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index bdb0446..db723fa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -232,31 +232,49 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null)
                 return;
 
-            IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
-            if (engines == null) // No engine at all
-                return;
-
             lock (Items)
             {
                 foreach (TaskInventoryItem item in Items.Values)
                 {
-                    if (item.InvType == (int)InventoryType.LSL)
-                    {
-                        foreach (IScriptModule e in engines)
-                        {
-                            bool running;
-
-                            if (e.HasScript(item.ItemID, out running))
-                            {
-                                item.ScriptRunning = running;
-                                break;
-                            }
-                        }
-                    }
+                    bool running;
+                    if (TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running))
+                        item.ScriptRunning = running;
                 }
             }
         }
 
+        public bool TryGetScriptInstanceRunning(UUID itemId, out bool running)
+        {
+            running = false;
+
+            TaskInventoryItem item = GetInventoryItem(itemId);
+
+            if (item == null)
+                return false;
+
+            return TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running);
+        }
+
+        public static bool TryGetScriptInstanceRunning(Scene scene, TaskInventoryItem item, out bool running)
+        {
+            running = false;
+
+            if (item.InvType != (int)InventoryType.LSL)
+                return false;
+
+            IScriptModule[] engines = scene.RequestModuleInterfaces<IScriptModule>();
+            if (engines == null) // No engine at all
+                return false;
+
+            foreach (IScriptModule e in engines)
+            {
+                if (e.HasScript(item.ItemID, out running))
+                    return true;
+            }
+
+            return false;
+        }
+
         public int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
         {
             int scriptsValidForStarting = 0;
-- 
cgit v1.1