Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 14 insertions, 44 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3a9a146..e010864 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -97,15 +97,6 @@ namespace OpenSim.Region.Framework.Scenes
                 QueryScriptStates();
             }
         }
-
-        public int Count
-        {
-            get
-            {
-                lock (m_items)
-                    return m_items.Count;
-            }
-        }
         
         /// <summary>
         /// Constructor
@@ -244,52 +235,31 @@ 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;
+
             Items.LockItemsForRead(true);
             foreach (TaskInventoryItem item in Items.Values)
             {
                 if (item.InvType == (int)InventoryType.LSL)
                 {
-                    bool running;
-                    if (TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running))
-                        item.ScriptRunning = running;
+                    foreach (IScriptModule e in engines)
+                    {
+                        bool running;
+
+                        if (e.HasScript(item.ItemID, out running))
+                        {
+                            item.ScriptRunning = running;
+                            break;
+                        }
+                    }
                 }
             }
 
             Items.LockItemsForRead(false);
         }
 
-        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;