Restore the Avination way of position and angle calculation so resizers
work again.avinationmerge
parent
f025387f10
commit
00b36eb0fe
|
@ -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.
|
// If this is a linkset, we don't want the physics engine mucking up our group position here.
|
||||||
PhysicsActor actor = PhysActor;
|
PhysicsActor actor = PhysActor;
|
||||||
if (actor != null && ParentID == 0)
|
if (ParentID == 0)
|
||||||
{
|
{
|
||||||
if (actor != null)
|
if (actor != null)
|
||||||
m_groupPosition = actor.Position;
|
m_groupPosition = actor.Position;
|
||||||
|
@ -1080,10 +1080,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (ParentGroup.IsAttachment)
|
return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
|
||||||
return GroupPosition;
|
|
||||||
|
|
||||||
return m_offsetPosition + m_groupPosition;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue