diff options
| author | Melanie | 2011-02-12 00:42:10 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-12 00:42:10 +0000 |
| commit | e2762a68b36ee0568fba15d4d42432ffe9be91bd (patch) | |
| tree | a3b630ab92f8abe4ecfda606a6492c875d6b47c3 /OpenSim/Region/Framework | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | refactor: split out estate management commands into separate class (diff) | |
| download | opensim-SC-e2762a68b36ee0568fba15d4d42432ffe9be91bd.zip opensim-SC-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.gz opensim-SC-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.bz2 opensim-SC-e2762a68b36ee0568fba15d4d42432ffe9be91bd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 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>(); |