diff options
| author | Justin Clark-Casey (justincc) | 2012-10-19 02:52:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-19 02:52:12 +0100 |
| commit | 71b73d6dc31b30a55099531ff4dc9ab9929c57bf (patch) | |
| tree | 533f537c9881f6794b6f3bb67b6f1c2b21766fee /OpenSim/Region/Framework/Scenes | |
| parent | altering documentation for llGetLinkName, as the current documentation is rat... (diff) | |
| parent | normalize quaternion.Slerp outputs (diff) | |
| download | opensim-SC_OLD-71b73d6dc31b30a55099531ff4dc9ab9929c57bf.zip opensim-SC_OLD-71b73d6dc31b30a55099531ff4dc9ab9929c57bf.tar.gz opensim-SC_OLD-71b73d6dc31b30a55099531ff4dc9ab9929c57bf.tar.bz2 opensim-SC_OLD-71b73d6dc31b30a55099531ff4dc9ab9929c57bf.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index da2c069..27ef4c9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4584,6 +4584,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4584 | } | 4584 | } |
| 4585 | 4585 | ||
| 4586 | Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations); | 4586 | Quaternion rot = Quaternion.Slerp(RotationOffset,APIDTarget,1.0f/(float)m_APIDIterations); |
| 4587 | rot.Normalize(); | ||
| 4587 | UpdateRotation(rot); | 4588 | UpdateRotation(rot); |
| 4588 | 4589 | ||
| 4589 | m_APIDIterations--; | 4590 | m_APIDIterations--; |