From f1e10e555d1cc7bee40b4fd05caf2507c5808816 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 4 Aug 2007 18:15:48 +0000
Subject: clean up of startup config settings (command line args etc), Now
 using the Nini configuration library (suggest we look into using this for the
 rest of our config handling, as it provides a standard interface for command
 line args, INI files, Xml files, .NET config files, and windows registry).
 One IMPORTANT change is that to TO START GRIDMODE , you need to now use
 -gridmode=true . Also need someone to test it under mono. (there is a dll
 that has been compiled under mono available, just hoping that we don't have
 to deal with separate dlls for windows and linux.

---
 .../Region/Environment/Scenes/AllNewSceneObjectGroup2.cs   | 12 ++++++++++--
 .../Region/Environment/Scenes/AllNewSceneObjectPart2.cs    | 14 +++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
index 8ed04d9..3eb34b4 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
@@ -94,16 +94,24 @@ namespace OpenSim.Region.Environment.Scenes
             return dupe;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="part"></param>
         public void CopyRootPart(AllNewSceneObjectPart2 part)
         {
-            AllNewSceneObjectPart2 newPart = part.Copy(m_scene);
+            AllNewSceneObjectPart2 newPart = part.Copy(m_scene.PrimIDAllocate());
             this.m_parts.Add(newPart.UUID, newPart);
             this.SetPartAsRoot(newPart);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="part"></param>
         public void CopyPart(AllNewSceneObjectPart2 part)
         {
-            AllNewSceneObjectPart2 newPart = part.Copy(m_scene);
+            AllNewSceneObjectPart2 newPart = part.Copy(m_scene.PrimIDAllocate());
             this.m_parts.Add(newPart.UUID, newPart);
             this.SetPartAsNonRoot(newPart);
         }
diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
index 65b4287..42acab9 100644
--- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
+++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
@@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
         public uint EveryoneMask = FULL_MASK_PERMISSIONS;
         public uint BaseMask = FULL_MASK_PERMISSIONS;
 
-        protected PrimitiveBaseShape m_shape;
+       
         protected byte[] m_particleSystem = new byte[0];
 
         protected AllNewSceneObjectGroup2 m_parentGroup;
@@ -54,9 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         protected string m_name;
-        /// <summary>
-        /// 
-        /// </summary>
         public virtual string Name
         {
             get { return m_name; }
@@ -154,9 +151,9 @@ namespace OpenSim.Region.Environment.Scenes
             set { m_touchName = value; }
         }
 
+        protected PrimitiveBaseShape m_shape;
         public PrimitiveBaseShape Shape
         {
-
             get { return this.m_shape; }
             set { m_shape = value; }
         }
@@ -245,14 +242,13 @@ namespace OpenSim.Region.Environment.Scenes
         /// 
         /// </summary>
         /// <returns></returns>
-        public AllNewSceneObjectPart2 Copy(Scene scene)
+        public AllNewSceneObjectPart2 Copy(uint localID)
         {
             AllNewSceneObjectPart2 dupe = (AllNewSceneObjectPart2)this.MemberwiseClone();
             dupe.m_shape = m_shape.Copy();
             dupe.m_regionHandle = m_regionHandle;
-            uint newLocalID = scene.PrimIDAllocate();
             dupe.UUID = LLUUID.Random();
-            dupe.LocalID = newLocalID;
+            dupe.LocalID = localID;
             dupe.OffsetPosition = new LLVector3(OffsetPosition.X, OffsetPosition.Y, OffsetPosition.Z);
             dupe.RotationOffset = new LLQuaternion(RotationOffset.X, RotationOffset.Y, RotationOffset.Z, RotationOffset.W);
             dupe.Velocity = new LLVector3(0, 0, 0);
@@ -303,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             else
             {
-                if (m_updateFlag == 2) // is a new prim just been created/reloaded or has major changes
+                if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
                 {
                     SendFullUpdateToAllClients();
                     ClearUpdateSchedule();
-- 
cgit v1.1