diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index cff458efcd..11165682bf 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -513,19 +513,6 @@ namespace OpenSim.Region.Framework.Scenes get { return m_sceneGraph.m_syncRoot; } } - /// - /// This is for llGetRegionFPS - /// - public float SimulatorFPS - { - get { return StatsReporter.getLastReportedSimFPS(); } - } - - public float[] SimulatorStats - { - get { return StatsReporter.getLastReportedSimStats(); } - } - public string DefaultScriptEngine { get { return m_defaultScriptEngine; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8291105b0b..f450d4ca7a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5926,7 +5926,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 e1c837e51a..6c3da20994 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2462,7 +2462,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++) {