OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'justincc-master'

master-beforevarregion
Justin Clark-Casey (justincc) 2014-01-10 20:37:14 +00:00
parent 5e72de1908 9050c152b4
commit 68cbccb288
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -3235,13 +3235,10 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 oldPos; Vector3 oldPos;
// FIXME: This improves the situation where editing just the root prim of an attached object would send
// all the other parts to oblivion after detach/reattach. However, a problem remains since the root prim
// still ends up in the wrong position on reattach.
if (IsAttachment) if (IsAttachment)
oldPos = RootPart.OffsetPosition; oldPos = m_rootPart.AttachedPos + m_rootPart.OffsetPosition; // OffsetPosition should always be 0 in an attachments's root prim
else else
oldPos = AbsolutePosition + RootPart.OffsetPosition; oldPos = AbsolutePosition + m_rootPart.OffsetPosition;
Vector3 diff = oldPos - newPos; Vector3 diff = oldPos - newPos;
Quaternion partRotation = m_rootPart.RotationOffset; Quaternion partRotation = m_rootPart.RotationOffset;
@ -3256,6 +3253,9 @@ namespace OpenSim.Region.Framework.Scenes
} }
AbsolutePosition = newPos; AbsolutePosition = newPos;
if (IsAttachment)
m_rootPart.AttachedPos = newPos;
HasGroupChanged = true; HasGroupChanged = true;
ScheduleGroupForTerseUpdate(); ScheduleGroupForTerseUpdate();