From 0975ff6cfd90209e9a6e622eaae1fb151f026853 Mon Sep 17 00:00:00 2001 From: MW Date: Fri, 3 Aug 2007 16:17:05 +0000 Subject: [PATCH] Yet another commit related to the SceneObject rewrites. --- .../Environment/Scenes/AllNewSceneObjectGroup2.cs | 13 +++++++++++-- .../Environment/Scenes/AllNewSceneObjectPart2.cs | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs index 22aadf4534..d3b69b4298 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs @@ -52,6 +52,14 @@ namespace OpenSim.Region.Environment.Scenes } + /// + /// + /// + public AllNewSceneObjectGroup2(byte[] data) + { + + } + /// /// /// @@ -67,6 +75,7 @@ namespace OpenSim.Region.Environment.Scenes this.SetPartAsRoot(newPart); } + #region Copying /// /// @@ -102,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes { AllNewSceneObjectPart2 newPart = part.Copy(m_scene); this.m_parts.Add(newPart.UUID, newPart); - newPart.ParentID = this.m_rootPart.LocalID; + this.SetPartAsNonRoot(newPart); } #endregion @@ -499,7 +508,7 @@ namespace OpenSim.Region.Environment.Scenes /// private void SetPartAsNonRoot(AllNewSceneObjectPart2 part) { - + part.ParentID = this.m_rootPart.LocalID; } /// diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs index 813f2e1332..93f2d0acf4 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs @@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// Recreate a SceneObjectPart (prim) + /// Re/create a SceneObjectPart (prim) /// /// /// @@ -553,8 +553,6 @@ namespace OpenSim.Region.Environment.Scenes remoteClient.SendPrimTerseUpdate(m_regionHandle, 64096, LocalID, lPos, mRot); } - - #endregion } }