Second part of the fix for llGetLocalPos; get attachment offset in the root prim of an attachment. This function now behaves in line with SL.

1 files changed, 15 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 27034ed..976a9ff 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2136,12 +2136,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llGetLocalPos()
         {
             m_host.AddScriptLPS(1);
-           if (m_host.IsAttachment == true) {
-//m_log.DebugFormat("[localpos]:  {0})  {1}  {2}",m_host.OffsetPosition.X,m_host.OffsetPosition.Y,m_host.OffsetPosition.Z);
-                return new LSL_Vector(m_host.OffsetPosition.X,
-                                      m_host.OffsetPosition.Y,
-                                      m_host.OffsetPosition.Z);
-                }
+            if (m_host.IsAttachment == true) {
+                if (m_host.IsRoot == true)
+                {
+                    return new LSL_Vector(m_host.AbsolutePosition.X,
+                                        m_host.AbsolutePosition.Y,
+                                        m_host.AbsolutePosition.Z);
+
+                }
+                else
+                {
+                    return new LSL_Vector(m_host.OffsetPosition.X,
+                                        m_host.OffsetPosition.Y,
+                                        m_host.OffsetPosition.Z);
+                }
+                    }
 
             if (m_host.ParentID != 0)
             {