Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-12 00:42:10 +00:00
13 changed files with 605 additions and 405 deletions

View File

@@ -64,6 +64,8 @@ namespace OpenSim.Region.Framework.Scenes
#region Fields
public bool EmergencyMonitoring = false;
public SynchronizeSceneHandler SynchronizeScene;
public SimStatsReporter StatsReporter;
public List<Border> NorthBorders = new List<Border>();