diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs index ff19384..7e95d7f 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | |||
| @@ -914,7 +914,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
| 914 | 914 | ||
| 915 | // Sum velocities | 915 | // Sum velocities |
| 916 | m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection | 916 | m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection |
| 917 | 917 | ||
| 918 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) | 918 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) |
| 919 | { | 919 | { |
| 920 | m_lastAngularVelocity.X = 0; | 920 | m_lastAngularVelocity.X = 0; |