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

Minor correction to yesterday's changes. Make normal prim crossing (no attach) work well again.

bulletsim
Diva Canto 2011-04-29 08:42:51 -07:00
parent e462b926ac
commit 73caa4e94a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3361,8 +3361,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
SceneObjectGroup sog = Copy(false); SceneObjectGroup sog = Copy(false);
sog.m_isDeleted = false; sog.m_isDeleted = false;
sog.RootPart.IsAttachment = false;
sog.RootPart.GroupPosition = sog.RootPart.AttachedPos;
return sog; return sog;
} }

3
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3108,6 +3108,9 @@ namespace OpenSim.Region.Framework.Scenes
// We need to make a copy and pass that copy // We need to make a copy and pass that copy
// because of transfers withn the same sim // because of transfers withn the same sim
ISceneObject clone = sog.CloneForNewScene(); ISceneObject clone = sog.CloneForNewScene();
// Attachment module assumes that GroupPosition holds the offsets...!
((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
((SceneObjectGroup)clone).RootPart.IsAttachment = false;
cAgent.AttachmentObjects.Add(clone); cAgent.AttachmentObjects.Add(clone);
cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot()); cAgent.AttachmentObjectStates.Add(sog.GetStateSnapshot());
} }