aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-02-11 23:53:52 +0100
committerMelanie2011-02-11 23:53:52 +0100
commit413f0c684801d5849d867432321228e26e4488dd (patch)
tree2208226265a562b28eaba861d5591d5c6efb4c6a /OpenSim/Region/Framework/Scenes
parentTemp fix (or is it a fox?) for map weirdness (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-413f0c684801d5849d867432321228e26e4488dd.zip
opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.gz
opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.bz2
opensim-SC-413f0c684801d5849d867432321228e26e4488dd.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2424194..171d637 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Region.Framework.Scenes
64 64
65 #region Fields 65 #region Fields
66 66
67 public bool EmergencyMonitoring = false;
68
67 public SynchronizeSceneHandler SynchronizeScene; 69 public SynchronizeSceneHandler SynchronizeScene;
68 public SimStatsReporter StatsReporter; 70 public SimStatsReporter StatsReporter;
69 public List<Border> NorthBorders = new List<Border>(); 71 public List<Border> NorthBorders = new List<Border>();