Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-10-18 23:48:35 +01:00
3 changed files with 101 additions and 36 deletions

View File

@@ -269,18 +269,26 @@ namespace OpenSim.Region.Framework.Interfaces
void ApplyGodPermissions(uint perms);
/// <summary>
/// Number of items in this inventory.
/// </summary>
int Count { get; }
/// <summary>
/// Returns true if this inventory contains any scripts
/// </summary></returns>
bool ContainsScripts();
/// <summary>
/// Returns the count of scripts contained
/// </summary></returns>
/// Number of scripts in this inventory.
/// </summary>
/// <remarks>
/// Includes both running and non running scripts.
/// </remarks>
int ScriptCount();
/// <summary>
/// Returns the count of running scripts contained
/// Number of running scripts in this inventory.
/// </summary></returns>
int RunningScriptCount();