BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8d2e25f..36dead0 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -243,7 +243,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
         parms.avatarContactProcessingThreshold = 0.1f;
 
         parms.maxPersistantManifoldPoolSize = 0f;
-        parms.shouldDisableContactPoolDynamicAllocation = ConfigurationParameters.numericFalse;
+        parms.shouldDisableContactPoolDynamicAllocation = ConfigurationParameters.numericTrue;
         parms.shouldForceUpdateAllAabbs = ConfigurationParameters.numericFalse;
         parms.shouldRandomizeSolverOrder = ConfigurationParameters.numericFalse;
         parms.shouldSplitSimulationIslands = ConfigurationParameters.numericFalse;
@@ -840,7 +840,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
             case "avatardensity": UpdateParameterAvatars(ref m_params[0].avatarDensity, "avatar", localID, val); break;
             case "avatarrestitution": UpdateParameterAvatars(ref m_params[0].avatarRestitution, "avatar", localID, val); break;
             case "avatarcapsuleradius": UpdateParameterAvatars(ref m_params[0].avatarCapsuleRadius, "avatar", localID, val); break;
-            case "avatarcapsuleheight": UpdateParameterAvatars(ref m_params[0].avatarCapsuleHeight, "avatar", localID, val); break;

+            case "avatarcapsuleheight": UpdateParameterAvatars(ref m_params[0].avatarCapsuleHeight, "avatar", localID, val); break;
             case "avatarcontactprocessingthreshold": UpdateParameterAvatars(ref m_params[0].avatarContactProcessingThreshold, "avatar", localID, val); break;
 
             default: ret = false; break;
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 34f70a2..41be415 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -865,7 +865,7 @@
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldDisableContactPoolDynamicAllocation = True;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;