Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
This commit is contained in:
Melanie
2012-04-13 03:00:48 +01:00
8 changed files with 179 additions and 110 deletions

View File

@@ -84,6 +84,14 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary>
void StartProcessing();
/// <summary>
/// Get the execution times of all scripts in the given array if they are currently running.
/// </summary>
/// <returns>
/// A float the value is a representative execution time in milliseconds of all scripts in that Array.
/// </returns>
float GetScriptExecutionTime(List<UUID> itemIDs);
/// <summary>
/// Get the execution times of all scripts in each object.
/// </summary>