diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Region/Physics/OdePlugin/ODEDynamics.cs | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC_OLD-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC_OLD-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC_OLD-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC_OLD-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.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; |