diff options
Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 03c1e12..d7581cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6383,7 +6383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6383 | public LSL_Float llGetRegionFPS() | 6383 | public LSL_Float llGetRegionFPS() |
| 6384 | { | 6384 | { |
| 6385 | m_host.AddScriptLPS(1); | 6385 | m_host.AddScriptLPS(1); |
| 6386 | return World.SimulatorFPS; | 6386 | return World.StatsReporter.getLastReportedSimFPS(); |
| 6387 | } | 6387 | } |
| 6388 | 6388 | ||
| 6389 | 6389 | ||