diff options
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 8e860fb..8af7514 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -146,6 +146,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
146 | protected SceneCommunicationService m_sceneGridService; | 146 | protected SceneCommunicationService m_sceneGridService; |
147 | public bool LoginsDisabled = true; | 147 | public bool LoginsDisabled = true; |
148 | public bool LoadingPrims = false; | 148 | public bool LoadingPrims = false; |
149 | public bool CombineRegions = false; | ||
149 | 150 | ||
150 | public new float TimeDilation | 151 | public new float TimeDilation |
151 | { | 152 | { |
@@ -656,6 +657,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
656 | } | 657 | } |
657 | 658 | ||
658 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); | 659 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); |
660 | CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false); | ||
659 | 661 | ||
660 | IConfig interest_management_config = m_config.Configs["InterestManagement"]; | 662 | IConfig interest_management_config = m_config.Configs["InterestManagement"]; |
661 | if (interest_management_config != null) | 663 | if (interest_management_config != null) |