ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IScriptModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
This commit is contained in:
Melanie
2012-04-09 21:40:03 +01:00
parent a25d12d166 78c0028179
commit 67d4f1d66c
7 changed files with 159 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
View File

@@ -227,6 +227,16 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary></returns>
bool ContainsScripts();
/// <summary>
/// Returns the count of scripts contained
/// </summary></returns>
int ScriptCount();
/// <summary>
/// Returns the count of running scripts contained
/// </summary></returns>
int RunningScriptCount();
/// <summary>
/// Get the uuids of all items in this inventory
/// </summary>

8
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
View File

@@ -71,6 +71,12 @@ namespace OpenSim.Region.Framework.Interfaces
bool HasScript(UUID itemID, out bool running);
/// <summary>
/// Returns true if a script is running.
/// </summary>
/// <param name="itemID">The item ID of the script.</param>
bool GetScriptState(UUID itemID);
void SaveAllState();
/// <summary>
@@ -87,4 +93,4 @@ namespace OpenSim.Region.Framework.Interfaces
/// </returns>
Dictionary<uint, float> GetObjectScriptsExecutionTimes();
}
}
}