Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

avinationmerge
Melanie 2012-04-09 21:40:41 +01:00
commit a45ff62adb
1 changed files with 2 additions and 10 deletions

View File

@ -2280,20 +2280,12 @@ 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);
} }