diff options
| author | Justin Clark-Casey (justincc) | 2012-03-27 02:10:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-27 02:10:02 +0100 |
| commit | 09c85a6a6c3f40688c16e646342de773f8891c56 (patch) | |
| tree | 7261bf18a1ab1368c5759ba859a13782e47957e0 /OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |
| parent | In TerrainModule.cs, the command terrain save-tile is modified to remove an u... (diff) | |
| parent | BulletSim: make avatar animations update properly. (diff) | |
| download | opensim-SC-09c85a6a6c3f40688c16e646342de773f8891c56.zip opensim-SC-09c85a6a6c3f40688c16e646342de773f8891c56.tar.gz opensim-SC-09c85a6a6c3f40688c16e646342de773f8891c56.tar.bz2 opensim-SC-09c85a6a6c3f40688c16e646342de773f8891c56.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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) |