diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs index 9beeabb..2342bfa 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |||
| @@ -675,7 +675,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 675 | m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity | 675 | m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity |
| 676 | 676 | ||
| 677 | d.Vector3 pos = d.BodyGetPosition(Body); | 677 | d.Vector3 pos = d.BodyGetPosition(Body); |
| 678 | Vector3 accel = new Vector3(-(m_dir.X - m_lastLinearVelocityVector.X / 0.1f), -(m_dir.Y - m_lastLinearVelocityVector.Y / 0.1f), m_dir.Z - m_lastLinearVelocityVector.Z / 0.1f); | 678 | // Vector3 accel = new Vector3(-(m_dir.X - m_lastLinearVelocityVector.X / 0.1f), -(m_dir.Y - m_lastLinearVelocityVector.Y / 0.1f), m_dir.Z - m_lastLinearVelocityVector.Z / 0.1f); |
| 679 | Vector3 posChange = new Vector3(); | 679 | Vector3 posChange = new Vector3(); |
| 680 | posChange.X = pos.X - m_lastPositionVector.X; | 680 | posChange.X = pos.X - m_lastPositionVector.X; |
| 681 | posChange.Y = pos.Y - m_lastPositionVector.Y; | 681 | posChange.Y = pos.Y - m_lastPositionVector.Y; |