diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 529dc9e0b7..80d7871885 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -532,19 +532,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 03c1e12381..d7581cc7fa 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 8f450f8988..9aeb98ebd0 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++) {