diff options
| author | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
| commit | 7807d118073fc3e82272e27eba8268d24e2a1f5d (patch) | |
| tree | d97d0a899f22d1707e38f96f61a0d40a9e7c4ace /OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |
| parent | Fix the sound issue. It was caused by missing assets; once the client has mad... (diff) | |
| parent | Change the way IRegionModule us referenced by IEmailModule to (diff) | |
| download | opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.zip opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.gz opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.bz2 opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -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; |