From 5f266fd57131193a9ff37b03f214aa0476e2e3aa Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 24 Oct 2010 17:18:21 +0200
Subject: Change the results from llGetPrimitiveParams to be the same as SL for
 the prim position. This will make attached resizer scripts work like SL.
 Existing resizers may be affected adversely.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs               | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0321515..5521326 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1060,7 +1060,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get {
                 if (IsAttachment)
-                    return GroupPosition;
+                    return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
 
 //                return m_offsetPosition + m_groupPosition; }
                 return m_groupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset) ; }  //KF: Rotation was ignored!
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3249ae2..94d3dee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8029,13 +8029,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
                                                       part.AbsolutePosition.Y,
                                                       part.AbsolutePosition.Z);
-                        // For some reason, the part.AbsolutePosition.* values do not change if the
-                        // linkset is rotated; they always reflect the child prim's world position
-                        // as though the linkset is unrotated. This is incompatible behavior with SL's
-                        // implementation, so will break scripts imported from there (not to mention it
-                        // makes it more difficult to determine a child prim's actual inworld position).
-                        if (part.ParentID != 0)
-                            v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
                         res.Add(v);
                         break;
 
-- 
cgit v1.1