From 6b5b73bfae422c947796c0c7d0ead7a925cfd984 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 8 Apr 2012 13:18:03 +0200 Subject: [PATCH] Fix a LSL merge artefact --- .../Shared/Api/Implementation/LSL_Api.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7cf284d602..e71f027b1d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2280,20 +2280,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } else { - if (part.IsRoot) - { - return new LSL_Vector(part.AttachedPos.X, - part.AttachedPos.Y, - part.AttachedPos.Z); - } + if (part.ParentGroup.IsAttachment) + pos = part.AttachedPos; else - { pos = part.AbsolutePosition; - } } -// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos); - return new LSL_Vector(pos.X, pos.Y, pos.Z); }