From 0975ff6cfd90209e9a6e622eaae1fb151f026853 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 3 Aug 2007 16:17:05 +0000
Subject: Yet another commit related to the SceneObject rewrites.

---
 .../Region/Environment/Scenes/AllNewSceneObjectGroup2.cs    | 13 +++++++++++--
 OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs |  4 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 22aadf4..d3b69b4 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -55,6 +55,14 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// 
         /// </summary>
+        public AllNewSceneObjectGroup2(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
         public AllNewSceneObjectGroup2(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, PrimitiveBaseShape shape)
         {
             m_regionHandle = regionHandle;
@@ -67,6 +75,7 @@ namespace OpenSim.Region.Environment.Scenes
             this.SetPartAsRoot(newPart);
         }
 
+
         #region Copying
         /// <summary>
         /// 
@@ -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
         /// <param name="part"></param>
         private void SetPartAsNonRoot(AllNewSceneObjectPart2 part)
         {
-
+            part.ParentID = this.m_rootPart.LocalID;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 813f2e1..93f2d0a 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// Recreate a SceneObjectPart (prim)
+        /// Re/create a SceneObjectPart (prim)
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="parent"></param>
@@ -553,8 +553,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             remoteClient.SendPrimTerseUpdate(m_regionHandle, 64096, LocalID, lPos, mRot);
         }
-
-
         #endregion
     }
 }
-- 
cgit v1.1