diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2714836..b650b79 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -886,7 +886,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
886 | if (m_frame % m_update_backup == 0) | 886 | if (m_frame % m_update_backup == 0) |
887 | CleanTempObjects(); | 887 | CleanTempObjects(); |
888 | 888 | ||
889 | if (Region_Status != RegionStatus.SlaveScene) | 889 | if (RegionStatus != RegionStatus.SlaveScene) |
890 | { | 890 | { |
891 | if (m_frame % m_update_events == 0) | 891 | if (m_frame % m_update_events == 0) |
892 | UpdateEvents(); | 892 | UpdateEvents(); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 89b5d77..4f5f523 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -127,9 +127,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
127 | 127 | ||
128 | protected string m_datastore; | 128 | protected string m_datastore; |
129 | 129 | ||
130 | /* Used by the loadbalancer plugin on GForge */ | ||
130 | protected RegionStatus m_regStatus; | 131 | protected RegionStatus m_regStatus; |
131 | 132 | public RegionStatus RegionStatus | |
132 | public RegionStatus Region_Status | ||
133 | { | 133 | { |
134 | get { return m_regStatus; } | 134 | get { return m_regStatus; } |
135 | set { m_regStatus = value; } | 135 | set { m_regStatus = value; } |