diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 37352af..00e699e 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -430,7 +430,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
430 | /// </summary> | 430 | /// </summary> |
431 | private int m_lastFrameTick; | 431 | private int m_lastFrameTick; |
432 | 432 | ||
433 | public bool CombineRegions = false; | ||
434 | /// <summary> | 433 | /// <summary> |
435 | /// Tick at which the last maintenance run occurred. | 434 | /// Tick at which the last maintenance run occurred. |
436 | /// </summary> | 435 | /// </summary> |
@@ -1060,7 +1059,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1060 | 1059 | ||
1061 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); | 1060 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); |
1062 | m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion); | 1061 | m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion); |
1063 | CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false); | ||
1064 | 1062 | ||
1065 | string[] possibleMapConfigSections = new string[] { "Map", "Startup" }; | 1063 | string[] possibleMapConfigSections = new string[] { "Map", "Startup" }; |
1066 | 1064 | ||