From 00b36eb0fedc8de0d3a3ce9461828970fbd50fd8 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 9 Dec 2011 20:55:48 +0100
Subject: Restore the Avination way of position and angle calculation so
 resizers work again.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0e48515..428fe1c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // If this is a linkset, we don't want the physics engine mucking up our group position here.
                 PhysicsActor actor = PhysActor;
-                if (actor != null && ParentID == 0)
+                if (ParentID == 0)
                 {
                     if (actor != null)
                         m_groupPosition = actor.Position;
@@ -1080,10 +1080,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                if (ParentGroup.IsAttachment)
-                    return GroupPosition;
-
-                return m_offsetPosition + m_groupPosition;
+                return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
             }
         }
 
-- 
cgit v1.1