From 93d5d66fbd44733186439971d819f9409dac4bdd Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 26 Oct 2013 21:20:19 -0700
Subject: BulletSim: update collision flags to make sure they fit in the shorts
 provided.

---
 OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index f7dd158..be6f152 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -249,7 +249,7 @@ public enum CollisionFlags : uint
     BS_VEHICLE_COLLISIONS            = 1 << 12, // return collisions for vehicle ground checking
     BS_RETURN_ROOT_COMPOUND_SHAPE    = 1 << 13, // return the pos/rot of the root shape in a compound shape
     BS_NONE                          = 0,
-    BS_ALL                           = 0xFFFFFFFF
+    BS_ALL                           = 0x7FFF   // collision flags are a signed short
 };
 
 // Values f collisions groups and masks
@@ -265,14 +265,14 @@ public enum CollisionFilterGroups : uint
     BDebrisGroup            = 1 << 3,   // 0008
     BSensorTrigger          = 1 << 4,   // 0010
     BCharacterGroup         = 1 << 5,   // 0020
-    BAllGroup               = 0x000FFFFF,
+    BAllGroup               = 0x0007FFF,        // collision flags are a signed short
     // Filter groups defined by BulletSim
-    BGroundPlaneGroup       = 1 << 10,  // 0400
-    BTerrainGroup           = 1 << 11,  // 0800
-    BRaycastGroup           = 1 << 12,  // 1000
-    BSolidGroup             = 1 << 13,  // 2000
+    BGroundPlaneGroup       = 1 << 8,  // 0400
+    BTerrainGroup           = 1 << 9,  // 0800
+    BRaycastGroup           = 1 << 10,  // 1000
+    BSolidGroup             = 1 << 11,  // 2000
     // BLinksetGroup        = xx  // a linkset proper is either static or dynamic
-    BLinksetChildGroup      = 1 << 14,  // 4000
+    BLinksetChildGroup      = 1 << 12,  // 4000
 };
 
 // CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0
-- 
cgit v1.1


From d23ef79f98d03dd8964e56a412f1417893cff7ec Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 26 Oct 2013 21:30:51 -0700
Subject: BulletSim: restore collision flags when clear collision cache. THis
 fixes the extranious addition of objects to the collision cache which created
 extra CPU overhead.

---
 bin/lib32/BulletSim.dll   | Bin 992768 -> 1094144 bytes
 bin/lib32/libBulletSim.so | Bin 2332216 -> 2337209 bytes
 bin/lib64/BulletSim.dll   | Bin 1231872 -> 1231360 bytes
 bin/lib64/libBulletSim.so | Bin 2522559 -> 2523676 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 187d150..ee7cce7 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 e60bdd3..ee2bd80 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 e8738e1..b4c4bec 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 ef3eb3a..9c4033b 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1