From 13778c895ae8adca907781c9d8c3a9ada30814e0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 15 Jan 2013 01:44:34 -0800
Subject: BulletSim: by default, turn on continuious collision detection (CCD)
 and enable friction computation caching. Remove dangerous BulletSim settings
 from OpenSimDefaults.ini.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 6 +++---
 bin/OpenSimDefaults.ini                         | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 27ff047..862dbf6 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -318,13 +318,13 @@ public static class BSParam
             (s,p,l,v) => { s.UpdateParameterObject((x)=>{AngularSleepingThreshold=x;}, p, l, v); },
             (s,o,v) => { s.PE.SetSleepingThresholds(o.PhysBody, v, v); } ),
         new ParameterDefn("CcdMotionThreshold", "Continuious collision detection threshold (0 means no CCD)" ,
-            0f,     // set to zero to disable
+            0.3f,     // set to zero to disable
             (s,cf,p,v) => { CcdMotionThreshold = cf.GetFloat(p, v); },
             (s) => { return CcdMotionThreshold; },
             (s,p,l,v) => { s.UpdateParameterObject((x)=>{CcdMotionThreshold=x;}, p, l, v); },
             (s,o,v) => { s.PE.SetCcdMotionThreshold(o.PhysBody, v); } ),
         new ParameterDefn("CcdSweptSphereRadius", "Continuious collision detection test radius" ,
-            0f,
+            0.2f,
             (s,cf,p,v) => { CcdSweptSphereRadius = cf.GetFloat(p, v); },
             (s) => { return CcdSweptSphereRadius; },
             (s,p,l,v) => { s.UpdateParameterObject((x)=>{CcdSweptSphereRadius=x;}, p, l, v); },
@@ -465,7 +465,7 @@ public static class BSParam
             (s) => { return s.UnmanagedParams[0].shouldSplitSimulationIslands; },
             (s,p,l,v) => { s.UnmanagedParams[0].shouldSplitSimulationIslands = v; } ),
 	    new ParameterDefn("ShouldEnableFrictionCaching", "Enable friction computation caching",
-            ConfigurationParameters.numericFalse,
+            ConfigurationParameters.numericTrue,
             (s,cf,p,v) => { s.UnmanagedParams[0].shouldEnableFrictionCaching = BSParam.NumericBool(cf.GetBoolean(p, BSParam.BoolNumeric(v))); },
             (s) => { return s.UnmanagedParams[0].shouldEnableFrictionCaching; },
             (s,p,l,v) => { s.UnmanagedParams[0].shouldEnableFrictionCaching = v; } ),
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 74bae01..45c3d40 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -929,18 +929,10 @@
 
     MaxObjectMass = 10000.01
 
-    ; Dynamic parameters
-    LinearDamping = 0.0
-    AngularDamping = 0.0
-    DeactivationTime = 0.2
     CollisionMargin = 0.04
 
     ; Linkset constraint parameters
     LinkImplementation = 1      ; 0=constraint, 1=compound
-    LinkConstraintUseFrameOffset = False
-    LinkConstraintEnableTransMotor = True
-    LinkConstraintTransMotorMaxVel = 5.0
-    LinkConstraintTransMotorMaxForce = 0.1
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1