From f62008f728047e9cfe2ba2edaef18e186c36260e Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 13 Feb 2015 20:59:13 -0800
Subject: BulletSim: bring the BulletSim dll's and so's up to date with the
 sources in the 'libs' source repository. No functional changes.

---
 bin/lib32/BulletSim.dll   | Bin 1337856 -> 1338880 bytes
 bin/lib32/libBulletSim.so | Bin 2311537 -> 2312132 bytes
 bin/lib64/BulletSim.dll   | Bin 1546752 -> 1547264 bytes
 bin/lib64/libBulletSim.so | Bin 2474914 -> 2475617 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index ddc2f48..6d006bf 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 8637528..ec29f58 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 60fa59e..82774a2 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index e3df064..8b09275 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 85133daae05118021dba3b00dc0475142c1de565 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Feb 2015 21:45:19 +0000
Subject: minor: Add explanation that [Startup] CombineContiguousRegions should
 be false for varregions.

---
 bin/OpenSim.ini.example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d352c33..1b5a4af 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
-- 
cgit v1.1


From 7b9ad11a9896e905500269286b6d46a857d10694 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 21 Feb 2015 14:27:01 -0800
Subject: BulletSim: update the OSX BulletSim binary to the latest sources in
 opensim-libs.

---
 bin/lib32/libBulletSim.dylib | Bin 1435436 -> 1439996 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
index 3c2de2d..b7a42e3 100755
Binary files a/bin/lib32/libBulletSim.dylib and b/bin/lib32/libBulletSim.dylib differ
-- 
cgit v1.1