Merge pull request #5 from gamucf/moses.metricsPhase1

Moses.metrics phase1

2 files changed, 12 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 906c862..438dce9 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -61,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes
     {
         private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
         private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
+        
+        public const int m_defaultNumberFramesStored = 10;
 
         public delegate void SynchronizeSceneHandler(Scene scene);
 
@@ -1115,17 +1117,18 @@ namespace OpenSim.Region.Framework.Scenes
             // file
             if (statisticsConfig != null)
             {
-               // Create the StatsReporter using the number of frames to store
-               // for the frame time statistics, or 10 frames if the config 
-               // file doesn't contain a value
-               StatsReporter = new SimStatsReporter(this, 
-                  statisticsConfig.GetInt("NumberOfFrames", 10));
+                // Create the StatsReporter using the number of frames to store
+                // for the frame time statistics, or 10 frames if the config 
+                // file doesn't contain a value
+                StatsReporter = new SimStatsReporter(this, 
+                    statisticsConfig.GetInt("NumberOfFrames", 
+                    m_defaultNumberFramesStored));
             }
             else
             {
-               // Create a StatsReporter with the current scene and a default
-               // 10 frames stored for the frame time statistics
-               StatsReporter = new SimStatsReporter(this);
+                // Create a StatsReporter with the current scene and a default
+                // 10 frames stored for the frame time statistics
+                StatsReporter = new SimStatsReporter(this);
             }
             
             StatsReporter.OnSendStatsResult += SendSimStatsPackets;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 6182bcd..0eab898 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
         // the Total, Simulation, Physics, and Network Frame Time; It is set to 
         // 10 by default but can be changed by the OpenSim.ini configuration file 
         // NumberOfFrames parameter
-        private int m_numberFramesStored = 10;
+        private int m_numberFramesStored = Scene.m_defaultNumberFramesStored;
 
         // The arrays that will hold the time it took to run the past N frames, 
         // where N is the num_frames_to_average given by the configuration file