diff options
author | Diva Canto | 2015-08-30 11:07:27 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-30 11:07:27 -0700 |
commit | f6d79c7cbbde06f9d8efde8ced8b1eda19f10b9a (patch) | |
tree | 2e660a4f1dd3ee2076b8177aeedc3e0ea9176539 | |
parent | Restore FlotsamAssetCache as default and pre-enabled asset cache module (diff) | |
download | opensim-SC_OLD-f6d79c7cbbde06f9d8efde8ced8b1eda19f10b9a.zip opensim-SC_OLD-f6d79c7cbbde06f9d8efde8ced8b1eda19f10b9a.tar.gz opensim-SC_OLD-f6d79c7cbbde06f9d8efde8ced8b1eda19f10b9a.tar.bz2 opensim-SC_OLD-f6d79c7cbbde06f9d8efde8ced8b1eda19f10b9a.tar.xz |
Mantis #7713: fixed bug introduced by 1st MOSES patch.
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 4847696..2174e51 100755 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
226 | // the Total, Simulation, Physics, and Network Frame Time; It is set to | 226 | // the Total, Simulation, Physics, and Network Frame Time; It is set to |
227 | // 10 by default but can be changed by the OpenSim.ini configuration file | 227 | // 10 by default but can be changed by the OpenSim.ini configuration file |
228 | // NumberOfFrames parameter | 228 | // NumberOfFrames parameter |
229 | private int m_numberFramesStored = Scene.m_defaultNumberFramesStored; | 229 | private int m_numberFramesStored; |
230 | 230 | ||
231 | // The arrays that will hold the time it took to run the past N frames, | 231 | // The arrays that will hold the time it took to run the past N frames, |
232 | // where N is the num_frames_to_average given by the configuration file | 232 | // where N is the num_frames_to_average given by the configuration file |
@@ -259,7 +259,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
259 | private IEstateModule estateModule; | 259 | private IEstateModule estateModule; |
260 | 260 | ||
261 | public SimStatsReporter(Scene scene) | 261 | public SimStatsReporter(Scene scene) |
262 | : this(scene, Scene.m_defaultNumberFramesStored) | ||
262 | { | 263 | { |
264 | } | ||
265 | |||
266 | public SimStatsReporter(Scene scene, int numberOfFrames) | ||
267 | { | ||
268 | // Store the number of frames from the OpenSim.ini configuration file | ||
269 | m_numberFramesStored = numberOfFrames; | ||
270 | |||
263 | // Initialize the different frame time arrays to the correct sizes | 271 | // Initialize the different frame time arrays to the correct sizes |
264 | m_totalFrameTimeMilliseconds = new double[m_numberFramesStored]; | 272 | m_totalFrameTimeMilliseconds = new double[m_numberFramesStored]; |
265 | m_simulationFrameTimeMilliseconds = new double[m_numberFramesStored]; | 273 | m_simulationFrameTimeMilliseconds = new double[m_numberFramesStored]; |
@@ -300,13 +308,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | StatVerbosity.Info); | 308 | StatVerbosity.Info); |
301 | 309 | ||
302 | StatsManager.RegisterStat(SlowFramesStat); | 310 | StatsManager.RegisterStat(SlowFramesStat); |
303 | } | ||
304 | |||
305 | 311 | ||
306 | public SimStatsReporter(Scene scene, int numberOfFrames) : this (scene) | ||
307 | { | ||
308 | // Store the number of frames from the OpenSim.ini configuration file | ||
309 | m_numberFramesStored = numberOfFrames; | ||
310 | } | 312 | } |
311 | 313 | ||
312 | 314 | ||