From eb172be5412a631db115346b4e75e5731b989920 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:28:30 +0000
Subject: Revert "Fix non-root prim sit positions for prims where a sit target
 has been specified as well."

Revert to place on separate branch for now

This reverts commit 70e651a8d1d0c2a48c4f26cd1c70bee098c11a57.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 127ad40..17b6126 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.GroupPosition;
+                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
                     Rotation = sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
-- 
cgit v1.1