Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge

2 files changed, 2 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 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
         public LSL_Float llGetRegionFPS()
         {
             m_host.AddScriptLPS(1);
-            return World.SimulatorFPS;
+            return World.StatsReporter.getLastReportedSimFPS();
         }
 
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8f450f8..9aeb98e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2470,7 +2470,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
             m_host.AddScriptLPS(1);
             LSL_List ret = new LSL_List();
-            float[] stats = World.SimulatorStats;
+            float[] stats = World.StatsReporter.getLastReportedSimStats();
             
             for (int i = 0; i < 21; i++)
             {