diff options
author | Melanie | 2012-10-18 23:48:35 +0100 |
---|---|---|
committer | Melanie | 2012-10-18 23:48:35 +0100 |
commit | 4fe6d8c3a46a4cce89684f2031a9e30c8eb38751 (patch) | |
tree | 3619c97ae4fed6f3a00ca824a54247e7efcb1fcf /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDis... (diff) | |
download | opensim-SC_OLD-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.zip opensim-SC_OLD-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.gz opensim-SC_OLD-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.bz2 opensim-SC_OLD-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index e010864..f41e329 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -97,6 +97,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
97 | QueryScriptStates(); | 97 | QueryScriptStates(); |
98 | } | 98 | } |
99 | } | 99 | } |
100 | |||
101 | public int Count | ||
102 | { | ||
103 | get | ||
104 | { | ||
105 | lock (m_items) | ||
106 | return m_items.Count; | ||
107 | } | ||
108 | } | ||
100 | 109 | ||
101 | /// <summary> | 110 | /// <summary> |
102 | /// Constructor | 111 | /// Constructor |