From 395a0f7977a00f0c86e5718b2f4349f731b60609 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 29 Oct 2008 03:22:54 +0000 Subject: [PATCH] Minor formatting cleanup. --- .../Region/Environment/Scenes/InnerScene.cs | 2 +- .../Environment/Scenes/SceneObjectGroup.cs | 66 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 295569ec5e..1e21a58a65 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -1373,7 +1373,7 @@ namespace OpenSim.Region.Environment.Scenes List children = new List(); if (parenPrim != null) { - // We do this in reverse to get the link order of the prims correct + // We do this in reverse to get the link order of the prims correct for (int i = childPrims.Count - 1; i >= 0; i--) { foreach (EntityBase ent in EntityList) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 32c9255355..98c7fb5b13 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1831,41 +1831,41 @@ namespace OpenSim.Region.Environment.Scenes { m_parts.Add(linkPart.UUID, linkPart); - // Insert in terms of link numbers, the new links - // before the current ones (with the exception of - // the root prim. Shuffle the old ones up - foreach (KeyValuePair kvp in m_parts) - { - if (kvp.Value.LinkNum != 1) { - // Don't update root prim link number - kvp.Value.LinkNum += objectGroup.PrimCount; - } - } + // Insert in terms of link numbers, the new links + // before the current ones (with the exception of + // the root prim. Shuffle the old ones up + foreach (KeyValuePair kvp in m_parts) + { + if (kvp.Value.LinkNum != 1) + { + // Don't update root prim link number + kvp.Value.LinkNum += objectGroup.PrimCount; + } + } + linkPart.LinkNum = 2; - linkPart.LinkNum = 2; + linkPart.SetParent(this); + linkPart.AddFlag(PrimFlags.CreateSelected); - linkPart.SetParent(this); - linkPart.AddFlag(PrimFlags.CreateSelected); + //if (linkPart.PhysActor != null) + //{ + // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); + + //linkPart.PhysActor = null; + //} - //if (linkPart.PhysActor != null) - //{ - // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); - - //linkPart.PhysActor = null; - //} - - //TODO: rest of parts - int linkNum = 3; - foreach (SceneObjectPart part in objectGroup.Children.Values) - { - if (part.UUID != objectGroup.m_rootPart.UUID) - { - LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); - } - part.ClearUndoState(); - } - } + //TODO: rest of parts + int linkNum = 3; + foreach (SceneObjectPart part in objectGroup.Children.Values) + { + if (part.UUID != objectGroup.m_rootPart.UUID) + { + LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); + } + part.ClearUndoState(); + } + } m_scene.UnlinkSceneObject(objectGroup.UUID, true); objectGroup.Children.Clear(); @@ -1979,8 +1979,8 @@ namespace OpenSim.Region.Environment.Scenes part.SetParent(this); part.ParentID = m_rootPart.LocalId; - // Caller locks m_parts for us - m_parts.Add(part.UUID, part); + // Caller locks m_parts for us + m_parts.Add(part.UUID, part); part.LinkNum = linkNum;