aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-16 20:27:12 +0000
committerJustin Clarke Casey2008-01-16 20:27:12 +0000
commitb33da2538ed728bdc97cca20ada36913097160b0 (patch)
tree0464763a340891a49134d7bd66468302bc38dcad /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* Fixed a packet counting issue that I introduced (diff)
downloadopensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.zip
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.gz
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.bz2
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
1 files changed, 2 insertions, 4 deletions
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
572 /// <param name="part"></param> 572 /// <param name="part"></param>
573 public void CopyRootPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) 573 public void CopyRootPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
574 { 574 {
575 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID); 575 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count);
576 newPart.SetParent(this); 576 newPart.SetParent(this);
577 newPart.LinkNum = m_parts.Count;
578 m_parts.Add(newPart.UUID, newPart); 577 m_parts.Add(newPart.UUID, newPart);
579 SetPartAsRoot(newPart); 578 SetPartAsRoot(newPart);
580 } 579 }
@@ -602,9 +601,8 @@ namespace OpenSim.Region.Environment.Scenes
602 /// <param name="part"></param> 601 /// <param name="part"></param>
603 public void CopyPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) 602 public void CopyPart(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
604 { 603 {
605 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID); 604 SceneObjectPart newPart = part.Copy(m_scene.PrimIDAllocate(), OwnerID, GroupID, m_parts.Count);
606 newPart.SetParent(this); 605 newPart.SetParent(this);
607 newPart.LinkNum = m_parts.Count;
608 m_parts.Add(newPart.UUID, newPart); 606 m_parts.Add(newPart.UUID, newPart);
609 SetPartAsNonRoot(newPart); 607 SetPartAsNonRoot(newPart);
610 } 608 }