Fix a LSL merge artefact

avinationmerge
Melanie 2012-04-08 13:18:03 +02:00
parent b39de2425c
commit 6b5b73bfae
1 changed files with 2 additions and 10 deletions

View File

@ -2280,19 +2280,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
else else
{ {
if (part.IsRoot) if (part.ParentGroup.IsAttachment)
{ pos = part.AttachedPos;
return new LSL_Vector(part.AttachedPos.X,
part.AttachedPos.Y,
part.AttachedPos.Z);
}
else else
{
pos = part.AbsolutePosition; pos = part.AbsolutePosition;
} }
}
// m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
return new LSL_Vector(pos.X, pos.Y, pos.Z); return new LSL_Vector(pos.X, pos.Y, pos.Z);
} }