From f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 27 Sep 2012 08:23:29 -0700
Subject: 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.

---
 OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')

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
 
-- 
cgit v1.1