diff options
author | Melanie | 2012-04-13 03:00:48 +0100 |
---|---|---|
committer | Melanie | 2012-04-13 03:00:48 +0100 |
commit | fe65b518765a8c88c1f3067b47d775b9b1142961 (patch) | |
tree | 3a97f13715090d8c925543ae49ecae1930578d5d /OpenSim/Region/ScriptEngine/Shared | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mantis 55025 Implement script time. (diff) | |
download | opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.zip opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.gz opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.bz2 opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 76106a0..783650c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -11176,7 +11176,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11176 | ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384)); | 11176 | ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384)); |
11177 | break; | 11177 | break; |
11178 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: | 11178 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: |
11179 | ret.Add(new LSL_Float(0)); | 11179 | ret.Add(new LSL_Float(av.ScriptExecutionTime() / 1000.0f)); |
11180 | break; | 11180 | break; |
11181 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: | 11181 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: |
11182 | ret.Add(new LSL_Integer(1)); | 11182 | ret.Add(new LSL_Integer(1)); |
@@ -11244,9 +11244,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11244 | ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384)); | 11244 | ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384)); |
11245 | break; | 11245 | break; |
11246 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: | 11246 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: |
11247 | // Average cpu time per simulator frame expended on all scripts in the object | 11247 | // Average cpu time in seconds per simulator frame expended on all scripts in the object |
11248 | // Not currently available at Object level | 11248 | ret.Add(new LSL_Float(obj.ParentGroup.ScriptExecutionTime() / 1000.0f)); |
11249 | ret.Add(new LSL_Float(0)); | ||
11250 | break; | 11249 | break; |
11251 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: | 11250 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: |
11252 | // according to the SL wiki A prim or linkset will have prim | 11251 | // according to the SL wiki A prim or linkset will have prim |