diff options
| author | Glenn Martin | 2015-05-19 14:07:44 -0400 |
|---|---|---|
| committer | Glenn Martin | 2015-05-19 14:07:44 -0400 |
| commit | 91a55c0794367eaf56b1eef887b28ff8d4645bfb (patch) | |
| tree | fdade1a62aabdf4138f6cbbcbf03bdc9be2ca3c2 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'moses.metricsPhase2' of git.irl.ucf.edu:/irl/git/opensim into m... (diff) | |
| parent | Merge pull request #5 from gamucf/moses.metricsPhase1 (diff) | |
| download | opensim-SC_OLD-91a55c0794367eaf56b1eef887b28ff8d4645bfb.zip opensim-SC_OLD-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.gz opensim-SC_OLD-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.bz2 opensim-SC_OLD-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.xz | |
Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2
Fixed conflicts.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9fd1055..31900ec 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 const int m_defaultNumberFramesStored = 10; | 67 | public const int m_defaultNumberFramesStored = 10; |
| 66 | 68 | ||