aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-18 23:48:35 +0100
committerMelanie2012-10-18 23:48:35 +0100
commit4fe6d8c3a46a4cce89684f2031a9e30c8eb38751 (patch)
tree3619c97ae4fed6f3a00ca824a54247e7efcb1fcf /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentminor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDis... (diff)
downloadopensim-SC-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.zip
opensim-SC-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.gz
opensim-SC-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.bz2
opensim-SC-4fe6d8c3a46a4cce89684f2031a9e30c8eb38751.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs9
2 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 4274cbe..9d921de 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -270,17 +270,25 @@ namespace OpenSim.Region.Framework.Interfaces
270 void ApplyGodPermissions(uint perms); 270 void ApplyGodPermissions(uint perms);
271 271
272 /// <summary> 272 /// <summary>
273 /// Number of items in this inventory.
274 /// </summary>
275 int Count { get; }
276
277 /// <summary>
273 /// Returns true if this inventory contains any scripts 278 /// Returns true if this inventory contains any scripts
274 /// </summary></returns> 279 /// </summary></returns>
275 bool ContainsScripts(); 280 bool ContainsScripts();
276 281
277 /// <summary> 282 /// <summary>
278 /// Returns the count of scripts contained 283 /// Number of scripts in this inventory.
279 /// </summary></returns> 284 /// </summary>
285 /// <remarks>
286 /// Includes both running and non running scripts.
287 /// </remarks>
280 int ScriptCount(); 288 int ScriptCount();
281 289
282 /// <summary> 290 /// <summary>
283 /// Returns the count of running scripts contained 291 /// Number of running scripts in this inventory.
284 /// </summary></returns> 292 /// </summary></returns>
285 int RunningScriptCount(); 293 int RunningScriptCount();
286 294
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