Merge branch 'master' into httptests

3 files changed, 0 insertions, 14 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9d868a1..3fe3992 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -192,15 +192,6 @@
     ;; YOU HAVE BEEN WARNED!!!
     ; TrustBinaries = false
 
-    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content or varregions!)} {true false} 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
-    ;; Also, this setting should be set to false for varregions as they are proper larger single regions rather than combined smaller regions.
-    ; CombineContiguousRegions = false
-
     ;# {InworldRestartShutsDown} {} {Shutdown instance on region restart?} {true false} false
     ;; If you have only one region in an instance, or to avoid the many bugs
     ;; that you can trigger in modules by restarting a region, set this to
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
 
diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll
index 8781a82..4c5519d 100755
--- a/bin/Warp3D.dll
+++ b/bin/Warp3D.dll