diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:27:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:27:26 +0000 |
| commit | 910f07dffa001fbb6c3dd7f5ae3cfbaad161864e (patch) | |
| tree | 69dcc56d4ba37a2216a25601b22ab614247faccf /OpenSim/Region/Framework/Scenes | |
| parent | Revert "fix avatar rotation when sitting on a linked part" (diff) | |
| download | opensim-SC-910f07dffa001fbb6c3dd7f5ae3cfbaad161864e.zip opensim-SC-910f07dffa001fbb6c3dd7f5ae3cfbaad161864e.tar.gz opensim-SC-910f07dffa001fbb6c3dd7f5ae3cfbaad161864e.tar.bz2 opensim-SC-910f07dffa001fbb6c3dd7f5ae3cfbaad161864e.tar.xz | |
Revert "Refix fix for sitting on non-root linked prims with explicit sit targets."
This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 c88025c..127ad40 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2590,7 +2590,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2590 | 2590 | ||
| 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.GroupPosition; |
| 2594 | Rotation = sitTargetOrient; | 2594 | Rotation = sitTargetOrient; |
| 2595 | ParentPosition = part.AbsolutePosition; | 2595 | ParentPosition = part.AbsolutePosition; |
| 2596 | } | 2596 | } |