aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 977dcbe..9b12b4f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -235,6 +235,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
235 parms.terrainHitFraction = 0.8f; 235 parms.terrainHitFraction = 0.8f;
236 parms.terrainRestitution = 0f; 236 parms.terrainRestitution = 0f;
237 parms.avatarFriction = 0.5f; 237 parms.avatarFriction = 0.5f;
238 parms.avatarRestitution = 0.0f;
238 parms.avatarDensity = 60f; 239 parms.avatarDensity = 60f;
239 parms.avatarCapsuleRadius = 0.37f; 240 parms.avatarCapsuleRadius = 0.37f;
240 parms.avatarCapsuleHeight = 1.5f; // 2.140599f 241 parms.avatarCapsuleHeight = 1.5f; // 2.140599f
@@ -279,7 +280,9 @@ public class BSScene : PhysicsScene, IPhysicsParameters
279 parms.terrainHitFraction = pConfig.GetFloat("TerrainHitFraction", parms.terrainHitFraction); 280 parms.terrainHitFraction = pConfig.GetFloat("TerrainHitFraction", parms.terrainHitFraction);
280 parms.terrainRestitution = pConfig.GetFloat("TerrainRestitution", parms.terrainRestitution); 281 parms.terrainRestitution = pConfig.GetFloat("TerrainRestitution", parms.terrainRestitution);
281 parms.avatarFriction = pConfig.GetFloat("AvatarFriction", parms.avatarFriction); 282 parms.avatarFriction = pConfig.GetFloat("AvatarFriction", parms.avatarFriction);
283 parms.avatarRestitution = pConfig.GetFloat("AvatarRestitution", parms.avatarRestitution);
282 parms.avatarDensity = pConfig.GetFloat("AvatarDensity", parms.avatarDensity); 284 parms.avatarDensity = pConfig.GetFloat("AvatarDensity", parms.avatarDensity);
285 parms.avatarRestitution = pConfig.GetFloat("AvatarRestitution", parms.avatarRestitution);
283 parms.avatarCapsuleRadius = pConfig.GetFloat("AvatarCapsuleRadius", parms.avatarCapsuleRadius); 286 parms.avatarCapsuleRadius = pConfig.GetFloat("AvatarCapsuleRadius", parms.avatarCapsuleRadius);
284 parms.avatarCapsuleHeight = pConfig.GetFloat("AvatarCapsuleHeight", parms.avatarCapsuleHeight); 287 parms.avatarCapsuleHeight = pConfig.GetFloat("AvatarCapsuleHeight", parms.avatarCapsuleHeight);
285 } 288 }