diff options
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
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 | |||
243 | parms.avatarContactProcessingThreshold = 0.1f; | 243 | parms.avatarContactProcessingThreshold = 0.1f; |
244 | 244 | ||
245 | parms.maxPersistantManifoldPoolSize = 0f; | 245 | parms.maxPersistantManifoldPoolSize = 0f; |
246 | parms.shouldDisableContactPoolDynamicAllocation = ConfigurationParameters.numericFalse; | 246 | parms.shouldDisableContactPoolDynamicAllocation = ConfigurationParameters.numericTrue; |
247 | parms.shouldForceUpdateAllAabbs = ConfigurationParameters.numericFalse; | 247 | parms.shouldForceUpdateAllAabbs = ConfigurationParameters.numericFalse; |
248 | parms.shouldRandomizeSolverOrder = ConfigurationParameters.numericFalse; | 248 | parms.shouldRandomizeSolverOrder = ConfigurationParameters.numericFalse; |
249 | parms.shouldSplitSimulationIslands = ConfigurationParameters.numericFalse; | 249 | parms.shouldSplitSimulationIslands = ConfigurationParameters.numericFalse; |
@@ -840,7 +840,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
840 | case "avatardensity": UpdateParameterAvatars(ref m_params[0].avatarDensity, "avatar", localID, val); break; | 840 | case "avatardensity": UpdateParameterAvatars(ref m_params[0].avatarDensity, "avatar", localID, val); break; |
841 | case "avatarrestitution": UpdateParameterAvatars(ref m_params[0].avatarRestitution, "avatar", localID, val); break; | 841 | case "avatarrestitution": UpdateParameterAvatars(ref m_params[0].avatarRestitution, "avatar", localID, val); break; |
842 | case "avatarcapsuleradius": UpdateParameterAvatars(ref m_params[0].avatarCapsuleRadius, "avatar", localID, val); break; | 842 | case "avatarcapsuleradius": UpdateParameterAvatars(ref m_params[0].avatarCapsuleRadius, "avatar", localID, val); break; |
843 | case "avatarcapsuleheight": UpdateParameterAvatars(ref m_params[0].avatarCapsuleHeight, "avatar", localID, val); break; | 843 | case "avatarcapsuleheight": UpdateParameterAvatars(ref m_params[0].avatarCapsuleHeight, "avatar", localID, val); break; |
844 | case "avatarcontactprocessingthreshold": UpdateParameterAvatars(ref m_params[0].avatarContactProcessingThreshold, "avatar", localID, val); break; | 844 | case "avatarcontactprocessingthreshold": UpdateParameterAvatars(ref m_params[0].avatarContactProcessingThreshold, "avatar", localID, val); break; |
845 | 845 | ||
846 | default: ret = false; break; | 846 | 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 @@ | |||
865 | CcdSweptSphereRadius = 0.0 | 865 | CcdSweptSphereRadius = 0.0 |
866 | ContactProcessingThreshold = 0.1 | 866 | ContactProcessingThreshold = 0.1 |
867 | MaxPersistantManifoldPoolSize = 0; | 867 | MaxPersistantManifoldPoolSize = 0; |
868 | ShouldDisableContactPoolDynamicAllocation = False; | 868 | ShouldDisableContactPoolDynamicAllocation = True; |
869 | ShouldForceUpdateAllAabbs = False; | 869 | ShouldForceUpdateAllAabbs = False; |
870 | ShouldRandomizeSolverOrder = False; | 870 | ShouldRandomizeSolverOrder = False; |
871 | ShouldSplitSimulationIslands = False; | 871 | ShouldSplitSimulationIslands = False; |