BulletSim: Fix linkset crash. Caused by the different body and shape

    pointers at runtime and at taint-time. Now passes the body into the
    taint.
Vehicles zero inertia when active to eliminate Bullet's contribution
    to vehicle motion.

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index 6910050..2d65a35 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -369,16 +369,16 @@ public enum CollisionFilterGroups : uint
     BSolidFilter             = 1 << 13,
 
     // The collsion filters and masked are defined in one place -- don't want them scattered
-    AvatarFilter            = BDefaultFilter | BCharacterFilter | BSolidFilter,
+    AvatarFilter            = BCharacterFilter,
     AvatarMask              = BAllFilter,
-    ObjectFilter            = BDefaultFilter | BSolidFilter,
+    ObjectFilter            = BSolidFilter,
     ObjectMask              = BAllFilter,
-    StaticObjectFilter      = BDefaultFilter | BStaticFilter | BSolidFilter,
+    StaticObjectFilter      = BStaticFilter,
     StaticObjectMask        = BAllFilter,
     VolumeDetectFilter      = BSensorTrigger,
     VolumeDetectMask        = ~BSensorTrigger,
     TerrainFilter           = BTerrainFilter,
-    TerrainMask             = BAllFilter,
+    TerrainMask             = BAllFilter & ~BStaticFilter,
     GroundPlaneFilter       = BAllFilter,
     GroundPlaneMask         = BAllFilter