From e34eaec55372689e5158b6df02b7c37315df0475 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 7 Nov 2008 19:17:24 +0000
Subject: * Remove more UpdateParentIDs() calls that are now duplicates

---
 .../Environment/Modules/ContentManagementSystem/MetaEntity.cs     | 1 -
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs             | 8 ++------
 OpenSim/Region/Examples/SimpleModule/ComplexObject.cs             | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index 16edc2c..fe685a5 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -171,7 +171,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
                 part.LocalId = m_Entity.Scene.PrimIDAllocate();
 
             //finalize
-            m_Entity.UpdateParentIDs();
             m_Entity.RootPart.PhysActor = null;
             m_Entity.Children = parts;
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 093024e..27a3d8a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -503,8 +503,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             reader.Close();
             sr.Close();
-
-            UpdateParentIDs();
         }
 
         /// <summary>
@@ -576,8 +574,6 @@ namespace OpenSim.Region.Environment.Scenes
             m_rootPart.ParentID = 0;
             m_rootPart.LocalId = m_scene.PrimIDAllocate();
             
-            //UpdateParentIDs();
-            
             // No need to lock here since the object isn't yet in a scene
             foreach (SceneObjectPart part in m_parts.Values)
             {
@@ -904,7 +900,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        ///
+        /// Add a new part to this scene object
         /// </summary>
         /// <param name="part"></param>
         public void AddPart(SceneObjectPart part)
@@ -933,7 +929,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// Make sure that every non root part has the proper parent root part local id
         /// </summary>
-        public void UpdateParentIDs()
+        private void UpdateParentIDs()
         {
             lock (m_parts)
             {
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 910bb28..3a0b05d 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -104,8 +104,6 @@ namespace OpenSim.Region.Examples.SimpleModule
                                   new Quaternion(0, -0.5f, -0.05f)));
 
             RootPart.Flags |= PrimFlags.Touch;
-
-            UpdateParentIDs();
         }
 
         public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)
-- 
cgit v1.1