Changed the 10 value to be a constant value inside of the Scene called m_DefaultNumberFramesStored.

Test Plan: Tested on windows with the json stats reporter.

Reviewers: rlouden, kboswell, clattin, ssirigam, martin

Reviewed By: rlouden, kboswell, clattin, ssirigam, martin

Differential Revision: http://cr.irl.ucf.edu/D273
fsassets
Steven Zielinski 2015-04-29 08:51:19 -04:00
parent bebdc29eff
commit cb3c6038af
2 changed files with 3 additions and 3 deletions

View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes
private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L; private const long DEFAULT_MIN_TIME_FOR_PERSISTENCE = 60L;
private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L; private const long DEFAULT_MAX_TIME_FOR_PERSISTENCE = 600L;
public const int m_DefaultNumberFramesStored = 10; public const int m_defaultNumberFramesStored = 10;
public delegate void SynchronizeSceneHandler(Scene scene); public delegate void SynchronizeSceneHandler(Scene scene);
@ -1122,7 +1122,7 @@ namespace OpenSim.Region.Framework.Scenes
// file doesn't contain a value // file doesn't contain a value
StatsReporter = new SimStatsReporter(this, StatsReporter = new SimStatsReporter(this,
statisticsConfig.GetInt("NumberOfFrames", statisticsConfig.GetInt("NumberOfFrames",
m_DefaultNumberFramesStored)); m_defaultNumberFramesStored));
} }
else else
{ {

View File

@ -217,7 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
// the Total, Simulation, Physics, and Network Frame Time; It is set to // 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 // 10 by default but can be changed by the OpenSim.ini configuration file
// NumberOfFrames parameter // NumberOfFrames parameter
private int m_numberFramesStored = Scene.m_DefaultNumberFramesStored; private int m_numberFramesStored = Scene.m_defaultNumberFramesStored;
// The arrays that will hold the time it took to run the past N frames, // 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 // where N is the num_frames_to_average given by the configuration file