OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
fsassets
Glenn Martin 2015-05-19 14:07:44 -04:00
parent 3efcef7d7e ff40cc43fa
commit 91a55c0794
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -61,6 +61,8 @@ 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 const int m_defaultNumberFramesStored = 10;