diff options
| author | Justin Clarke Casey | 2008-10-16 13:17:31 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-10-16 13:17:31 +0000 |
| commit | 67892343350a8af916ec4c16d341ad843550d54e (patch) | |
| tree | c3dca2238934cda8f890942568c5882a04a06258 /OpenSim/Region/ScriptEngine | |
| parent | * Releases the inter-region thread synchronization between physics in ODE on ... (diff) | |
| download | opensim-SC_OLD-67892343350a8af916ec4c16d341ad843550d54e.zip opensim-SC_OLD-67892343350a8af916ec4c16d341ad843550d54e.tar.gz opensim-SC_OLD-67892343350a8af916ec4c16d341ad843550d54e.tar.bz2 opensim-SC_OLD-67892343350a8af916ec4c16d341ad843550d54e.tar.xz | |
* Apply http://opensimulator.org/mantis/view.php?id=2405
* Implement llGetRegionFPS()
* Thanks idb
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7d3badb..9df318c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4842,11 +4842,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4842 | return (double)World.TimeDilation; | 4842 | return (double)World.TimeDilation; |
| 4843 | } | 4843 | } |
| 4844 | 4844 | ||
| 4845 | /// <summary> | ||
| 4846 | /// Returns the value reported in the client Statistics window | ||
| 4847 | /// </summary> | ||
| 4845 | public LSL_Float llGetRegionFPS() | 4848 | public LSL_Float llGetRegionFPS() |
| 4846 | { | 4849 | { |
| 4847 | m_host.AddScriptLPS(1); | 4850 | m_host.AddScriptLPS(1); |
| 4848 | //TODO: return actual FPS | 4851 | return World.SimulatorFPS; |
| 4849 | return 10.0f; | ||
| 4850 | } | 4852 | } |
| 4851 | 4853 | ||
| 4852 | /* particle system rules should be coming into this routine as doubles, that is | 4854 | /* particle system rules should be coming into this routine as doubles, that is |