From 2b290793ab7153c956db5637dd27dfbbd0a1cf98 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 10 Oct 2011 21:54:08 +0100
Subject: 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
---
OpenSim/Region/Framework/Scenes/Scene.cs | 13 -------------
.../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
.../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
3 files changed, 2 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region')
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
get { return m_sceneGraph.m_syncRoot; }
}
- /// <summary>
- /// This is for llGetRegionFPS
- /// </summary>
- 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 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
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 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
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++)
{
--
cgit v1.1