From b6fc5bad000e7e7af992e7f29eeb2de9f716fcc4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Oct 2012 17:30:43 -0700
Subject: BulletSim: fix problem with avatars sinking into the ground. Change
 terrain activation state to DISABLE_SIMULATION for better performance.

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

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index d9427e1..30fa50a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -443,7 +443,8 @@ public class BSShapeCollection : IDisposable
         if (shapeType == ShapeData.PhysicsShapeType.SHAPE_AVATAR)
         {
             newShape = new BulletShape(
-                        BulletSimAPI.BuildCapsuleShape2(PhysicsScene.World.ptr, 1.0f, 1.0f, nativeShapeData.Scale), shapeType);
+                        BulletSimAPI.BuildCapsuleShape2(PhysicsScene.World.ptr, 1f, 1f, nativeShapeData.Scale)
+                        , shapeType);
             DetailLog("{0},BSShapeCollection.BuiletPhysicalNativeShape,capsule,scale={1}", nativeShapeData.ID, nativeShapeData.Scale);
         }
         else
@@ -790,7 +791,6 @@ public class BSShapeCollection : IDisposable
                 // If the collisionObject is not the correct type for solidness, rebuild what's there
                 mustRebuild = true;
             }
-
         }
 
         if (mustRebuild || forceRebuild)
-- 
cgit v1.1