diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:27:03 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:27:03 +0000 |
| commit | 5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f (patch) | |
| tree | 136bf58bda3bcb062ddd769e7e35270adf3edde5 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f.zip opensim-SC_OLD-5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f.tar.gz opensim-SC_OLD-5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f.tar.bz2 opensim-SC_OLD-5aa3236ebeb4bbbdd5b539bfe0841029cf01fb9f.tar.xz | |
Revert "fix avatar rotation when sitting on a linked part"
Reverting for now to place on separate branch
This reverts commit 65304260af283211443a2872c46f6609d3e45649.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7a1017f..c88025c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2591,7 +2591,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2591 | //Quaternion result = (sitTargetOrient * vq) * nq; | 2591 | //Quaternion result = (sitTargetOrient * vq) * nq; |
| 2592 | 2592 | ||
| 2593 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition; | 2593 | m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition; |
| 2594 | Rotation = part.RotationOffset * sitTargetOrient; | 2594 | Rotation = sitTargetOrient; |
| 2595 | ParentPosition = part.AbsolutePosition; | 2595 | ParentPosition = part.AbsolutePosition; |
| 2596 | } | 2596 | } |
| 2597 | else | 2597 | else |