aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 19:17:24 +0000
committerJustin Clarke Casey2008-11-07 19:17:24 +0000
commite34eaec55372689e5158b6df02b7c37315df0475 (patch)
treed1c6bd72ca9c1ef60b5998c8a3d4b2edbaeb1984 /OpenSim
parent* Apply http://opensimulator.org/mantis/view.php?id=1883 (diff)
downloadopensim-SC_OLD-e34eaec55372689e5158b6df02b7c37315df0475.zip
opensim-SC_OLD-e34eaec55372689e5158b6df02b7c37315df0475.tar.gz
opensim-SC_OLD-e34eaec55372689e5158b6df02b7c37315df0475.tar.bz2
opensim-SC_OLD-e34eaec55372689e5158b6df02b7c37315df0475.tar.xz
* Remove more UpdateParentIDs() calls that are now duplicates
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs2
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
171 part.LocalId = m_Entity.Scene.PrimIDAllocate(); 171 part.LocalId = m_Entity.Scene.PrimIDAllocate();
172 172
173 //finalize 173 //finalize
174 m_Entity.UpdateParentIDs();
175 m_Entity.RootPart.PhysActor = null; 174 m_Entity.RootPart.PhysActor = null;
176 m_Entity.Children = parts; 175 m_Entity.Children = parts;
177 } 176 }
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
503 503
504 reader.Close(); 504 reader.Close();
505 sr.Close(); 505 sr.Close();
506
507 UpdateParentIDs();
508 } 506 }
509 507
510 /// <summary> 508 /// <summary>
@@ -576,8 +574,6 @@ namespace OpenSim.Region.Environment.Scenes
576 m_rootPart.ParentID = 0; 574 m_rootPart.ParentID = 0;
577 m_rootPart.LocalId = m_scene.PrimIDAllocate(); 575 m_rootPart.LocalId = m_scene.PrimIDAllocate();
578 576
579 //UpdateParentIDs();
580
581 // No need to lock here since the object isn't yet in a scene 577 // No need to lock here since the object isn't yet in a scene
582 foreach (SceneObjectPart part in m_parts.Values) 578 foreach (SceneObjectPart part in m_parts.Values)
583 { 579 {
@@ -904,7 +900,7 @@ namespace OpenSim.Region.Environment.Scenes
904 } 900 }
905 901
906 /// <summary> 902 /// <summary>
907 /// 903 /// Add a new part to this scene object
908 /// </summary> 904 /// </summary>
909 /// <param name="part"></param> 905 /// <param name="part"></param>
910 public void AddPart(SceneObjectPart part) 906 public void AddPart(SceneObjectPart part)
@@ -933,7 +929,7 @@ namespace OpenSim.Region.Environment.Scenes
933 /// <summary> 929 /// <summary>
934 /// Make sure that every non root part has the proper parent root part local id 930 /// Make sure that every non root part has the proper parent root part local id
935 /// </summary> 931 /// </summary>
936 public void UpdateParentIDs() 932 private void UpdateParentIDs()
937 { 933 {
938 lock (m_parts) 934 lock (m_parts)
939 { 935 {
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
104 new Quaternion(0, -0.5f, -0.05f))); 104 new Quaternion(0, -0.5f, -0.05f)));
105 105
106 RootPart.Flags |= PrimFlags.Touch; 106 RootPart.Flags |= PrimFlags.Touch;
107
108 UpdateParentIDs();
109 } 107 }
110 108
111 public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient) 109 public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)