diff options
| author | Melanie Thielker | 2016-01-31 03:08:24 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2016-01-31 03:08:24 +0100 |
| commit | 367b7d7e5ee226894293f00f63112938a1447778 (patch) | |
| tree | e4ef701e0dd0824e03cdd80163f7a90978e3d1c7 /OpenSim/Region/PhysicsModules/BulletS/BSParam.cs | |
| parent | Replace the new ODE lib with one built against GLIBC 2.12. It's not our (diff) | |
| parent | change parcel_owner_is_god configuration option from default from true to fa... (diff) | |
| download | opensim-SC-367b7d7e5ee226894293f00f63112938a1447778.zip opensim-SC-367b7d7e5ee226894293f00f63112938a1447778.tar.gz opensim-SC-367b7d7e5ee226894293f00f63112938a1447778.tar.bz2 opensim-SC-367b7d7e5ee226894293f00f63112938a1447778.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSParam.cs')
| -rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSParam.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs index aea69d7..389a441 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSParam.cs | |||
| @@ -633,7 +633,7 @@ public static class BSParam | |||
| 633 | new ParameterDefn<float>("AvatarAddForcePushFactor", "BSCharacter.AddForce is multiplied by this and mass to be like other physics engines", | 633 | new ParameterDefn<float>("AvatarAddForcePushFactor", "BSCharacter.AddForce is multiplied by this and mass to be like other physics engines", |
| 634 | 0.315f ), | 634 | 0.315f ), |
| 635 | new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped", | 635 | new ParameterDefn<float>("AvatarStopZeroThreshold", "Movement velocity below which avatar is assumed to be stopped", |
| 636 | 0.1f, | 636 | 0.4f, |
| 637 | (s) => { return (float)AvatarStopZeroThreshold; }, | 637 | (s) => { return (float)AvatarStopZeroThreshold; }, |
| 638 | (s,v) => { AvatarStopZeroThreshold = v; AvatarStopZeroThresholdSquared = v * v; } ), | 638 | (s,v) => { AvatarStopZeroThreshold = v; AvatarStopZeroThresholdSquared = v * v; } ), |
| 639 | new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground", | 639 | new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground", |