From 60e049ea39f9b347ac1395c2373d17a983ab7ff3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:31:39 +0000
Subject: Revert "Fix issue where sitting on non-root linked prims would send
 camera to wrong position in third-person and mouselook"

Reverting to place on separate branch

This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 +-------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs      | 9 ++-------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29751ff..20bc59c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5218,13 +5218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
                 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
             update.ObjectData = objectData;
-
-            SceneObjectPart parentPart = data.ParentPart;
-            if (parentPart != null)
-                update.ParentID = parentPart.ParentGroup.LocalId;
-            else
-                update.ParentID = 0;
-
+            update.ParentID = data.ParentID;
             update.PathCurve = 16;
             update.PathScaleX = 100;
             update.PathScaleY = 100;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ea8e4fe..7243db1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2312,10 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes
                 cameraEyeOffset = part.GetCameraEyeOffset();
                 forceMouselook = part.GetForceMouselook();
 
-                // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-                // being sat upon.
                 ControllingClient.SendSitResponse(
-                    part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+                    part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
                 m_requestedSitTargetUUID = part.UUID;
 
@@ -2594,10 +2592,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-                    // being sat upon.
-                    m_pos -= part.GroupPosition;
-
+                    m_pos -= part.AbsolutePosition;
                     ParentPosition = part.AbsolutePosition;
 
 //                        m_log.DebugFormat(
-- 
cgit v1.1