aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs19
-rwxr-xr-xOpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
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
61 { 61 {
62 private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L; 62 private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
63 private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L; 63 private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
64
65 public const int m_defaultNumberFramesStored = 10;
64 66
65 public delegate void SynchronizeSceneHandler(Scene scene); 67 public delegate void SynchronizeSceneHandler(Scene scene);
66 68
@@ -1115,17 +1117,18 @@ namespace OpenSim.Region.Framework.Scenes
1115 // file 1117 // file
1116 if (statisticsConfig != null) 1118 if (statisticsConfig != null)
1117 { 1119 {
1118 // Create the StatsReporter using the number of frames to store 1120 // Create the StatsReporter using the number of frames to store
1119 // for the frame time statistics, or 10 frames if the config 1121 // for the frame time statistics, or 10 frames if the config
1120 // file doesn't contain a value 1122 // file doesn't contain a value
1121 StatsReporter = new SimStatsReporter(this, 1123 StatsReporter = new SimStatsReporter(this,
1122 statisticsConfig.GetInt("NumberOfFrames", 10)); 1124 statisticsConfig.GetInt("NumberOfFrames",
1125 m_defaultNumberFramesStored));
1123 } 1126 }
1124 else 1127 else
1125 { 1128 {
1126 // Create a StatsReporter with the current scene and a default 1129 // Create a StatsReporter with the current scene and a default
1127 // 10 frames stored for the frame time statistics 1130 // 10 frames stored for the frame time statistics
1128 StatsReporter = new SimStatsReporter(this); 1131 StatsReporter = new SimStatsReporter(this);
1129 } 1132 }
1130 1133
1131 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 1134 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
217 // the Total, Simulation, Physics, and Network Frame Time; It is set to 217 // the Total, Simulation, Physics, and Network Frame Time; It is set to
218 // 10 by default but can be changed by the OpenSim.ini configuration file 218 // 10 by default but can be changed by the OpenSim.ini configuration file
219 // NumberOfFrames parameter 219 // NumberOfFrames parameter
220 private int m_numberFramesStored = 10; 220 private int m_numberFramesStored = Scene.m_defaultNumberFramesStored;
221 221
222 // The arrays that will hold the time it took to run the past N frames, 222 // The arrays that will hold the time it took to run the past N frames,
223 // where N is the num_frames_to_average given by the configuration file 223 // where N is the num_frames_to_average given by the configuration file