aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-10 21:54:08 +0100
committerJustin Clark-Casey (justincc)2011-10-10 21:54:08 +0100
commit2b290793ab7153c956db5637dd27dfbbd0a1cf98 (patch)
treefb92997c17552fa1f78c83c6d7f133c2b852085f /OpenSim/Region
parentremove unused LastAssetID from DynamicTextureUpdaer (diff)
downloadopensim-SC_OLD-2b290793ab7153c956db5637dd27dfbbd0a1cf98.zip
opensim-SC_OLD-2b290793ab7153c956db5637dd27dfbbd0a1cf98.tar.gz
opensim-SC_OLD-2b290793ab7153c956db5637dd27dfbbd0a1cf98.tar.bz2
opensim-SC_OLD-2b290793ab7153c956db5637dd27dfbbd0a1cf98.tar.xz
refactor: have lsl and ossl interrogate scene.StatsReporter directly rather than going through scene
I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods
Diffstat (limited to 'OpenSim/Region')
-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 bcf668f..5652231 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -513,19 +513,6 @@ namespace OpenSim.Region.Framework.Scenes
513 get { return m_sceneGraph.m_syncRoot; } 513 get { return m_sceneGraph.m_syncRoot; }
514 } 514 }
515 515
516 /// <summary>
517 /// This is for llGetRegionFPS
518 /// </summary>
519 public float SimulatorFPS
520 {
521 get { return StatsReporter.getLastReportedSimFPS(); }
522 }
523
524 public float[] SimulatorStats
525 {
526 get { return StatsReporter.getLastReportedSimStats(); }
527 }
528
529 public string DefaultScriptEngine 516 public string DefaultScriptEngine
530 { 517 {
531 get { return m_defaultScriptEngine; } 518 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 42e09fc..eabdce1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5925,7 +5925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5925 public LSL_Float llGetRegionFPS() 5925 public LSL_Float llGetRegionFPS()
5926 { 5926 {
5927 m_host.AddScriptLPS(1); 5927 m_host.AddScriptLPS(1);
5928 return World.SimulatorFPS; 5928 return World.StatsReporter.getLastReportedSimFPS();
5929 } 5929 }
5930 5930
5931 5931
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e1c837e..6c3da20 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
2462 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats"); 2462 CheckThreatLevel(ThreatLevel.Moderate, "osGetRegionStats");
2463 m_host.AddScriptLPS(1); 2463 m_host.AddScriptLPS(1);
2464 LSL_List ret = new LSL_List(); 2464 LSL_List ret = new LSL_List();
2465 float[] stats = World.SimulatorStats; 2465 float[] stats = World.StatsReporter.getLastReportedSimStats();
2466 2466
2467 for (int i = 0; i < 21; i++) 2467 for (int i = 0; i < 21; i++)
2468 { 2468 {