diff options
| author | Diva Canto | 2013-08-09 08:31:30 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-08-09 08:31:30 -0700 |
| commit | 2cdcf62b48fde64d1ad11a4db46afeddff1a0770 (patch) | |
| tree | 76d2f53def5e6cd05b9b9e5f3e3e1e759c29e87e /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
| parent | Go easy on enforcing session ids in position updates (diff) | |
| parent | BulletSim: adjust avatar position when the avatar's size is changed. (diff) | |
| download | opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.zip opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.gz opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.bz2 opensim-SC_OLD-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 4520171..fcb892a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
| @@ -570,9 +570,9 @@ public static class BSParam | |||
| 570 | new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground", | 570 | new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground", |
| 571 | -0.2f ), | 571 | -0.2f ), |
| 572 | new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground", | 572 | new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground", |
| 573 | 0.1f ), | 573 | 0.2f ), |
| 574 | new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground", | 574 | new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground", |
| 575 | 0.1f ), | 575 | 0.2f ), |
| 576 | new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions", | 576 | new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions", |
| 577 | 0.1f ), | 577 | 0.1f ), |
| 578 | new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground", | 578 | new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground", |