diff options
author | Justin Clark-Casey (justincc) | 2012-04-13 22:34:36 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-13 22:34:36 +0100 |
commit | 1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657 (patch) | |
tree | ccbd97c7ed18a0e6b9c5e6c771c6d7a2fca097e9 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunS... (diff) | |
parent | Mantis 55025 Implement script time. (diff) | |
download | opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.zip opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.gz opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.bz2 opensim-SC_OLD-1ad3fdb40ba86c6d0bcb9b06b5bb05004f670657.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8863df1..641d742 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3438,6 +3438,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
3438 | } | 3438 | } |
3439 | 3439 | ||
3440 | /// <summary> | 3440 | /// <summary> |
3441 | /// A float the value is a representative execution time in milliseconds of all scripts in all attachments. | ||
3442 | /// </summary> | ||
3443 | public float ScriptExecutionTime() | ||
3444 | { | ||
3445 | float time = 0.0f; | ||
3446 | lock (m_attachments) | ||
3447 | { | ||
3448 | foreach (SceneObjectGroup gobj in m_attachments) | ||
3449 | { | ||
3450 | if (gobj != null) | ||
3451 | { | ||
3452 | time += gobj.ScriptExecutionTime(); | ||
3453 | } | ||
3454 | } | ||
3455 | } | ||
3456 | return time; | ||
3457 | } | ||
3458 | |||
3459 | /// <summary> | ||
3441 | /// Returns the total count of running scripts in all parts. | 3460 | /// Returns the total count of running scripts in all parts. |
3442 | /// </summary> | 3461 | /// </summary> |
3443 | public int RunningScriptCount() | 3462 | public int RunningScriptCount() |