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

* Remove more UpdateParentIDs() calls that are now duplicates

0.6.0-stable
Justin Clarke Casey 2008-11-07 19:17:24 +00:00
parent e08c4376f7
commit e34eaec553
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
View File

@ -171,7 +171,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
part.LocalId = m_Entity.Scene.PrimIDAllocate(); part.LocalId = m_Entity.Scene.PrimIDAllocate();
//finalize //finalize
m_Entity.UpdateParentIDs();
m_Entity.RootPart.PhysActor = null; m_Entity.RootPart.PhysActor = null;
m_Entity.Children = parts; m_Entity.Children = parts;
} }

8
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -503,8 +503,6 @@ namespace OpenSim.Region.Environment.Scenes
reader.Close(); reader.Close();
sr.Close(); sr.Close();
UpdateParentIDs();
} }
/// <summary> /// <summary>
@ -576,8 +574,6 @@ namespace OpenSim.Region.Environment.Scenes
m_rootPart.ParentID = 0; m_rootPart.ParentID = 0;
m_rootPart.LocalId = m_scene.PrimIDAllocate(); m_rootPart.LocalId = m_scene.PrimIDAllocate();
//UpdateParentIDs();
// No need to lock here since the object isn't yet in a scene // No need to lock here since the object isn't yet in a scene
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)
{ {
@ -904,7 +900,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// /// Add a new part to this scene object
/// </summary> /// </summary>
/// <param name="part"></param> /// <param name="part"></param>
public void AddPart(SceneObjectPart part) public void AddPart(SceneObjectPart part)
@ -933,7 +929,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary> /// <summary>
/// Make sure that every non root part has the proper parent root part local id /// Make sure that every non root part has the proper parent root part local id
/// </summary> /// </summary>
public void UpdateParentIDs() private void UpdateParentIDs()
{ {
lock (m_parts) lock (m_parts)
{ {

2
OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
View File

@ -104,8 +104,6 @@ namespace OpenSim.Region.Examples.SimpleModule
new Quaternion(0, -0.5f, -0.05f))); new Quaternion(0, -0.5f, -0.05f)));
RootPart.Flags |= PrimFlags.Touch; RootPart.Flags |= PrimFlags.Touch;
UpdateParentIDs();
} }
public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient) public override void OnGrabPart(SceneObjectPart part, Vector3 offsetPos, IClientAPI remoteClient)