diff options
author | Kitto Flora | 2010-03-19 18:53:16 -0400 |
---|---|---|
committer | Kitto Flora | 2010-03-19 18:53:16 -0400 |
commit | add47befacb0397f2a0b5c9455ed1e658616aba4 (patch) | |
tree | 4d7159896bfedf892ffcb9b1ce9bc24f5544bea2 /OpenSim | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
download | opensim-SC-add47befacb0397f2a0b5c9455ed1e658616aba4.zip opensim-SC-add47befacb0397f2a0b5c9455ed1e658616aba4.tar.gz opensim-SC-add47befacb0397f2a0b5c9455ed1e658616aba4.tar.bz2 opensim-SC-add47befacb0397f2a0b5c9455ed1e658616aba4.tar.xz |
Update acceleration to 0 on no tphysical.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 5e6696e..e8894f7 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -804,6 +804,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
804 | if (m_isphysical && Body != IntPtr.Zero) | 804 | if (m_isphysical && Body != IntPtr.Zero) |
805 | { | 805 | { |
806 | d.BodyDisable(Body); | 806 | d.BodyDisable(Body); |
807 | Halt(); | ||
807 | } | 808 | } |
808 | } | 809 | } |
809 | 810 | ||
@@ -2972,7 +2973,8 @@ Console.WriteLine(" JointCreateFixed"); | |||
2972 | m_wLinObjectVel = Vector3.Zero; | 2973 | m_wLinObjectVel = Vector3.Zero; |
2973 | m_angularMotorDirection = Vector3.Zero; | 2974 | m_angularMotorDirection = Vector3.Zero; |
2974 | m_lastAngularVelocity = Vector3.Zero; | 2975 | m_lastAngularVelocity = Vector3.Zero; |
2975 | m_angularMotorDVel = Vector3.Zero; | 2976 | m_angularMotorDVel = Vector3.Zero; |
2977 | _acceleration = Vector3.Zero; | ||
2976 | } | 2978 | } |
2977 | 2979 | ||
2978 | private void UpdateLinDecay() | 2980 | private void UpdateLinDecay() |