diff options
| author | Robert Adams | 2013-07-24 10:52:54 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-07-30 07:22:43 -0700 |
| commit | 5a7784a0e6c3f549d0e7b59380ad05729cb93a4f (patch) | |
| tree | 99b327c183b30b613da2368237fe6726d112623f /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | minor: Add timeout secs to connection timeout message. Change message to ref... (diff) | |
| download | opensim-SC-5a7784a0e6c3f549d0e7b59380ad05729cb93a4f.zip opensim-SC-5a7784a0e6c3f549d0e7b59380ad05729cb93a4f.tar.gz opensim-SC-5a7784a0e6c3f549d0e7b59380ad05729cb93a4f.tar.bz2 opensim-SC-5a7784a0e6c3f549d0e7b59380ad05729cb93a4f.tar.xz | |
BulletSim: make density display and return value consistant with how
the simulator expects it (scaled to 100kg/m^3).
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 59e7f5f..58a417e 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -75,7 +75,7 @@ public sealed class BSCharacter : BSPhysObject | |||
| 75 | RawVelocity = OMV.Vector3.Zero; | 75 | RawVelocity = OMV.Vector3.Zero; |
| 76 | _buoyancy = ComputeBuoyancyFromFlying(isFlying); | 76 | _buoyancy = ComputeBuoyancyFromFlying(isFlying); |
| 77 | Friction = BSParam.AvatarStandingFriction; | 77 | Friction = BSParam.AvatarStandingFriction; |
| 78 | Density = BSParam.AvatarDensity / BSParam.DensityScaleFactor; | 78 | Density = BSParam.AvatarDensity; |
| 79 | 79 | ||
| 80 | // Old versions of ScenePresence passed only the height. If width and/or depth are zero, | 80 | // Old versions of ScenePresence passed only the height. If width and/or depth are zero, |
| 81 | // replace with the default values. | 81 | // replace with the default values. |