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/BSTerrainManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 50638d6..269c3d5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -334,7 +334,8 @@ public class BSTerrainManager
                                     (uint)CollisionFilterGroups.TerrainMask);
 
                 // Make sure the new shape is processed.
-                BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true);
+                // BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true);
+                BulletSimAPI.ForceActivationState2(mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION);
 
                 m_terrainModified = true;
             };
-- 
cgit v1.1