Restore the Avination way of position and angle calculation so resizers

work again.
avinationmerge
Melanie 2011-12-09 20:55:48 +01:00
parent f025387f10
commit 00b36eb0fe
1 changed files with 2 additions and 5 deletions

View File

@ -682,7 +682,7 @@ namespace OpenSim.Region.Framework.Scenes
{
// If this is a linkset, we don't want the physics engine mucking up our group position here.
PhysicsActor actor = PhysActor;
if (actor != null && ParentID == 0)
if (ParentID == 0)
{
if (actor != null)
m_groupPosition = actor.Position;
@ -1080,10 +1080,7 @@ namespace OpenSim.Region.Framework.Scenes
{
get
{
if (ParentGroup.IsAttachment)
return GroupPosition;
return m_offsetPosition + m_groupPosition;
return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
}
}