diff options
| author | Melanie | 2012-03-26 16:47:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-26 16:47:02 +0100 |
| commit | 0bd0514e811b03e4a52fa6d006f901b1a50d2d92 (patch) | |
| tree | 26ec87e5b19697a56a2daaa8b31c2f2603485b84 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add some more overloads to allow registering overloaded methods and lists (diff) | |
| download | opensim-SC-0bd0514e811b03e4a52fa6d006f901b1a50d2d92.zip opensim-SC-0bd0514e811b03e4a52fa6d006f901b1a50d2d92.tar.gz opensim-SC-0bd0514e811b03e4a52fa6d006f901b1a50d2d92.tar.bz2 opensim-SC-0bd0514e811b03e4a52fa6d006f901b1a50d2d92.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -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) |