From 19096bd391ac88bbccda00e4660a061020118bb9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 10 Oct 2011 22:23:42 +0100
Subject: Convert getLastReportedSimFPS() and getLastReportedSimStats() into
more idiomatic LastReportedSimFPS and LastReportedSimStats on
SimStatsReporter
---
.../Region/Framework/Scenes/SimStatsReporter.cs | 26 +++++++++++-----------
.../Shared/Api/Implementation/LSL_Api.cs | 2 +-
.../Shared/Api/Implementation/OSSL_Api.cs | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index ad64b55..b9d38d0 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -78,6 +78,19 @@ namespace OpenSim.Region.Framework.Scenes
UnAckedBytes = 24,
}
+ ///
+ /// This is for llGetRegionFPS
+ ///
+ public float LastReportedSimFPS
+ {
+ get { return lastReportedSimFPS; }
+ }
+
+ public float[] LastReportedSimStats
+ {
+ get { return lastReportedSimStats; }
+ }
+
// Sending a stats update every 3 seconds-
private int statsUpdatesEveryMS = 3000;
private float statsUpdateFactor = 0;
@@ -437,19 +450,6 @@ namespace OpenSim.Region.Framework.Scenes
m_activeScripts = count;
}
- ///
- /// This is for llGetRegionFPS
- ///
- public float getLastReportedSimFPS()
- {
- return lastReportedSimFPS;
- }
-
- public float[] getLastReportedSimStats()
- {
- return lastReportedSimStats;
- }
-
public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes)
{
AddInPackets(inPackets);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index eabdce1..0820d01 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.StatsReporter.getLastReportedSimFPS();
+ return World.StatsReporter.LastReportedSimFPS;
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6c3da20..2a7077b 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.StatsReporter.getLastReportedSimStats();
+ float[] stats = World.StatsReporter.LastReportedSimStats;
for (int i = 0; i < 21; i++)
{
--
cgit v1.1