aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 860193f..4d14a9e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -128,6 +128,7 @@ public static class BSParam
128 public static float AvatarAlwaysRunFactor { get; private set; } 128 public static float AvatarAlwaysRunFactor { get; private set; }
129 public static float AvatarDensity { get; private set; } 129 public static float AvatarDensity { get; private set; }
130 public static float AvatarRestitution { get; private set; } 130 public static float AvatarRestitution { get; private set; }
131 public static int AvatarShape { get; private set; }
131 public static float AvatarCapsuleWidth { get; private set; } 132 public static float AvatarCapsuleWidth { get; private set; }
132 public static float AvatarCapsuleDepth { get; private set; } 133 public static float AvatarCapsuleDepth { get; private set; }
133 public static float AvatarCapsuleHeight { get; private set; } 134 public static float AvatarCapsuleHeight { get; private set; }
@@ -565,6 +566,8 @@ public static class BSParam
565 3500f) , // 3.5 * 100 566 3500f) , // 3.5 * 100
566 new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.", 567 new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.",
567 0f ), 568 0f ),
569 new ParameterDefn<int>("AvatarShape", "Code for avatar physical shape: 0:capsule, 1:cube, 2:ovoid, 2:mesh",
570 BSShapeCollection.AvatarShapeCube ) ,
568 new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule", 571 new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
569 0.6f ) , 572 0.6f ) ,
570 new ParameterDefn<float>("AvatarCapsuleDepth", "The distance between the front and back of the avatar capsule", 573 new ParameterDefn<float>("AvatarCapsuleDepth", "The distance between the front and back of the avatar capsule",
@@ -572,11 +575,11 @@ public static class BSParam
572 new ParameterDefn<float>("AvatarCapsuleHeight", "Default height of space around avatar", 575 new ParameterDefn<float>("AvatarCapsuleHeight", "Default height of space around avatar",
573 1.5f ), 576 1.5f ),
574 new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground", 577 new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground",
575 -0.2f ), 578 0f ),
576 new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground", 579 new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground",
577 0.1f ), 580 -0.1f ),
578 new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground", 581 new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
579 0.1f ), 582 0f ),
580 new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions", 583 new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
581 0.1f ), 584 0.1f ),
582 new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped", 585 new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped",