diff options
| author | BlueWall | 2011-02-12 20:42:11 -0500 |
|---|---|---|
| committer | BlueWall | 2011-02-12 20:42:11 -0500 |
| commit | c0e1742d479d4390701688da685892555f28bfbc (patch) | |
| tree | 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
| parent | Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff) | |
| download | opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC-c0e1742d479d4390701688da685892555f28bfbc.tar.xz | |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | 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 4fca261..355671c 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>(); |