Merge commit '7e8bad05ec6150e082fb634e3210b83c33dbcfe7' into 0.8.1-post-fixes

6 files changed, 2 insertions, 1 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 987d8b2..39ee520 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -187,12 +187,13 @@
     ;; YOU HAVE BEEN WARNED!!!
     ; TrustBinaries = false
 
-    ;# {CombineContiguousRegions} {} {Create megaregions where possible? (Do not use with existing content!)} {true false} 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
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index ddc2f48..6d006bf 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
index 3c2de2d..b7a42e3 100755
--- a/bin/lib32/libBulletSim.dylib
+++ b/bin/lib32/libBulletSim.dylib
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 8637528..ec29f58 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 60fa59e..82774a2 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index e3df064..8b09275 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so