diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index 046726d..eb20eb3 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
@@ -821,7 +821,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
821 | */ | 821 | */ |
822 | 822 | ||
823 | // Get what the body is doing, this includes 'external' influences | 823 | // Get what the body is doing, this includes 'external' influences |
824 | Vector3 angularVelocity = m_prim.AngularVelocity; | 824 | Vector3 angularVelocity = m_prim.RotationalVelocity; |
825 | // Vector3 angularVelocity = Vector3.Zero; | 825 | // Vector3 angularVelocity = Vector3.Zero; |
826 | 826 | ||
827 | if (m_angularMotorApply > 0) | 827 | if (m_angularMotorApply > 0) |
@@ -910,7 +910,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
910 | m_lastAngularVelocity -= m_lastAngularVelocity * decayamount; | 910 | m_lastAngularVelocity -= m_lastAngularVelocity * decayamount; |
911 | 911 | ||
912 | // Apply to the body | 912 | // Apply to the body |
913 | m_prim.AngularVelocity = m_lastAngularVelocity; | 913 | m_prim.RotationalVelocity = m_lastAngularVelocity; |
914 | 914 | ||
915 | } //end MoveAngular | 915 | } //end MoveAngular |
916 | internal void LimitRotation(float timestep) | 916 | internal void LimitRotation(float timestep) |