From 910f07dffa001fbb6c3dd7f5ae3cfbaad161864e Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 23 Nov 2013 02:27:26 +0000 Subject: Revert "Refix fix for sitting on non-root linked prims with explicit sit targets." This reverts commit 78649eb0999a5f97cc541c94ec98d1d06ed957cb. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework/Scenes') 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 //Quaternion result = (sitTargetOrient * vq) * nq; - m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition; + m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - part.GroupPosition; Rotation = sitTargetOrient; ParentPosition = part.AbsolutePosition; } -- cgit v1.1