Merge branch 'master' into careminster

2026-08-06 01:06:30 +08:00 · 2012-10-18 23:48:35 +01:00
parent f6e1f7a4af 845228b35e
commit 4fe6d8c3a4
3 changed files with 101 additions and 36 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -97,6 +97,15 @@ namespace OpenSim.Region.Framework.Scenes
                QueryScriptStates();
            }
        }
+
+        public int Count
+        {
+            get
+            {
+                lock (m_items)
+                    return m_items.Count;
+            }
+        }
        
        /// <summary>
        /// Constructor