From b33da2538ed728bdc97cca20ada36913097160b0 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 16 Jan 2008 20:27:12 +0000 Subject: * Fix mantis 345 - it is now possible to duplicate prims directly in the region again without breakage * This includes their inventories * Also, this revision properly synchronizes prim inventory crud. --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 0b7f2a4..3327fea 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -572,9 +572,8 @@ namespace OpenSim.Region.Environment.Scenes /// public void CopyRootPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) { - SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID); + SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count); newPart.SetParent(this); - newPart.LinkNum = m_parts.Count; m_parts.Add(newPart.UUID, newPart); SetPartAsRoot(newPart); } @@ -602,9 +601,8 @@ namespace OpenSim.Region.Environment.Scenes /// public void CopyPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) { - SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID); + SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count); newPart.SetParent(this); - newPart.LinkNum = m_parts.Count; m_parts.Add(newPart.UUID, newPart); SetPartAsNonRoot(newPart); } -- cgit v1.1