diff options
author | Steven Zielinski | 2015-04-29 08:51:19 -0400 |
---|---|---|
committer | Steven Zielinski | 2015-04-29 16:20:03 -0400 |
commit | cb3c6038af6cf7e3d749250c4aa2596967ef8d70 (patch) | |
tree | 94e487b57004ed6f67120242690434847ae562c1 /OpenSim/Region/Framework | |
parent | Changed the 10 value to be a constant value inside of the Scene called m_Defa... (diff) | |
download | opensim-SC_OLD-cb3c6038af6cf7e3d749250c4aa2596967ef8d70.zip opensim-SC_OLD-cb3c6038af6cf7e3d749250c4aa2596967ef8d70.tar.gz opensim-SC_OLD-cb3c6038af6cf7e3d749250c4aa2596967ef8d70.tar.bz2 opensim-SC_OLD-cb3c6038af6cf7e3d749250c4aa2596967ef8d70.tar.xz |
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
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 345cc81..438dce9 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
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 | 64 | ||
65 | public const int m_DefaultNumberFramesStored = 10; | 65 | public const int m_defaultNumberFramesStored = 10; |
66 | 66 | ||
67 | public delegate void SynchronizeSceneHandler(Scene scene); | 67 | public delegate void SynchronizeSceneHandler(Scene scene); |
68 | 68 | ||
@@ -1122,7 +1122,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1122 | // file doesn't contain a value | 1122 | // file doesn't contain a value |
1123 | StatsReporter = new SimStatsReporter(this, | 1123 | StatsReporter = new SimStatsReporter(this, |
1124 | statisticsConfig.GetInt("NumberOfFrames", | 1124 | statisticsConfig.GetInt("NumberOfFrames", |
1125 | m_DefaultNumberFramesStored)); | 1125 | m_defaultNumberFramesStored)); |
1126 | } | 1126 | } |
1127 | else | 1127 | else |
1128 | { | 1128 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index d90d2b3..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 = Scene.m_DefaultNumberFramesStored; | 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 |