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/ScriptEngine/Shared/Api/Implementation/LSL_Api.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/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -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 c38a52e..078a22a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10367,7 +10367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10367 | ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384)); | 10367 | ret.Add(new LSL_Integer(av.RunningScriptCount() * 16384)); |
| 10368 | break; | 10368 | break; |
| 10369 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: | 10369 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: |
| 10370 | ret.Add(new LSL_Float(0)); | 10370 | ret.Add(new LSL_Float(av.ScriptExecutionTime() / 1000.0f)); |
| 10371 | break; | 10371 | break; |
| 10372 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: | 10372 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: |
| 10373 | ret.Add(new LSL_Integer(1)); | 10373 | ret.Add(new LSL_Integer(1)); |
| @@ -10435,9 +10435,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10435 | ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384)); | 10435 | ret.Add(new LSL_Integer(obj.ParentGroup.RunningScriptCount() * 16384)); |
| 10436 | break; | 10436 | break; |
| 10437 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: | 10437 | case ScriptBaseClass.OBJECT_SCRIPT_TIME: |
| 10438 | // Average cpu time per simulator frame expended on all scripts in the object | 10438 | // Average cpu time in seconds per simulator frame expended on all scripts in the object |
| 10439 | // Not currently available at Object level | 10439 | ret.Add(new LSL_Float(obj.ParentGroup.ScriptExecutionTime() / 1000.0f)); |
| 10440 | ret.Add(new LSL_Float(0)); | ||
| 10441 | break; | 10440 | break; |
| 10442 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: | 10441 | case ScriptBaseClass.OBJECT_PRIM_EQUIVALENCE: |
| 10443 | // according to the SL wiki A prim or linkset will have prim | 10442 | // according to the SL wiki A prim or linkset will have prim |