diff options
| author | Melanie | 2013-07-04 22:32:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-04 22:32:58 +0100 |
| commit | 5ddcc25ee9de481c40a26aabc57d77c71225162e (patch) | |
| tree | 298768abaca492365ac1c9786b0d4ce7dae934ab /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Guard against completely unknown user UUIDs. (diff) | |
| download | opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.zip opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.gz opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.bz2 opensim-SC_OLD-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 07e87d1..aa247dd 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -1276,7 +1276,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 1276 | 1276 | ||
| 1277 | VehicleAddForce(appliedGravity); | 1277 | VehicleAddForce(appliedGravity); |
| 1278 | 1278 | ||
| 1279 | VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}", | 1279 | VDetailLog("{0}, MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}", |
| 1280 | ControllingPrim.LocalID, m_VehicleGravity, | 1280 | ControllingPrim.LocalID, m_VehicleGravity, |
| 1281 | ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity); | 1281 | ControllingPrim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity); |
| 1282 | } | 1282 | } |