Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge

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,
         }
 
+        /// <summary>
+        /// This is for llGetRegionFPS
+        /// </summary>
+        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;
         }
 
-        /// <summary>
-        /// This is for llGetRegionFPS
-        /// </summary>
-        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 d7581cc..db3d403 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.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 9aeb98e..bd97f76 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.StatsReporter.getLastReportedSimStats();
+            float[] stats = World.StatsReporter.LastReportedSimStats;
             
             for (int i = 0; i < 21; i++)
             {