Merge branch 'master' into httptests

1 files changed, 0 insertions, 5 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ccea99..47257b2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -156,11 +156,6 @@
     ; YOU HAVE BEEN WARNED!!!
     TrustBinaries = false
 
-    ; Combine all contiguous regions into one large megaregion
-    ; Order your regions from South to North, West to East in your regions.ini and then set this to true
-    ; Warning!  Don't use this with regions that have existing content!, This will likely break them
-    CombineContiguousRegions = false
-
     ; the default view range. Viewers override this ( no major effect still )
     DefaultDrawDistance = 255.0