aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
3 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 529dc9e..80d7871 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -532,19 +532,6 @@ namespace OpenSim.Region.Framework.Scenes
532 get { return m_sceneGraph.m_syncRoot; } 532 get { return m_sceneGraph.m_syncRoot; }
533 } 533 }
534 534
535 /// <summary>
536 /// This is for llGetRegionFPS
537 /// </summary>
538 public float SimulatorFPS
539 {
540 get { return StatsReporter.getLastReportedSimFPS(); }
541 }
542
543 public float[] SimulatorStats
544 {
545 get { return StatsReporter.getLastReportedSimStats(); }
546 }
547
548 public string DefaultScriptEngine 535 public string DefaultScriptEngine
549 { 536 {
550 get { return m_defaultScriptEngine; } 537 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 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
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
2470 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats"); 2470 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
2471 m_host.AddScriptLPS(1); 2471 m_host.AddScriptLPS(1);
2472 LSL_List ret = new LSL_List(); 2472 LSL_List ret = new LSL_List();
2473 float[] stats = World.SimulatorStats; 2473 float[] stats = World.StatsReporter.getLastReportedSimStats();
2474 2474
2475 for (int i = 0; i < 21; i++) 2475 for (int i = 0; i < 21; i++)
2476 { 2476 {