From 5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 10 Nov 2008 18:10:00 +0000
Subject: * Extend basic scene test to retrieve the object from the scene and
 match uuids * Decouple sog and sop by removing the need to pass the sog to
 the sop when it is created - most of the code was doing this operation (and
 hence duplicating it) anyway * Remove unused constructors

---
 .../Region/Environment/Scenes/SceneObjectPart.cs   | 57 +---------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 3501224..4d54634 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -216,28 +216,19 @@ namespace OpenSim.Region.Environment.Scenes
             Rezzed = DateTime.Now;
         }
 
-        public SceneObjectPart(SceneObjectGroup parent, UUID ownerID,
-            PrimitiveBaseShape shape, Vector3 groupPosition, Vector3 offsetPosition)
-            : this(parent, ownerID, shape, groupPosition, Quaternion.Identity, offsetPosition)
-        {
-        }
-
         /// <summary>
-        /// Create a completely new SceneObjectPart (prim)
+        /// Create a completely new SceneObjectPart (prim).  This will need to be added separately to a SceneObjectGroup
         /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="parent"></param>
         /// <param name="ownerID"></param>
         /// <param name="shape"></param>
         /// <param name="position"></param>
         /// <param name="rotationOffset"></param>
         /// <param name="offsetPosition"></param>
         public SceneObjectPart(
-            SceneObjectGroup parent, UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
+            UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
             Quaternion rotationOffset, Vector3 offsetPosition)
         {
             m_name = "Primitive";
-            m_parentGroup = parent;
 
             Rezzed = DateTime.Now;
             _creationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
@@ -273,49 +264,6 @@ namespace OpenSim.Region.Environment.Scenes
             //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo());
         }
 
-        /// <summary>
-        /// Re/create a SceneObjectPart (prim)
-        /// currently not used, and maybe won't be
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="parent"></param>
-        /// <param name="ownerID"></param>
-        /// <param name="localID"></param>
-        /// <param name="shape"></param>
-        /// <param name="position"></param>
-        public SceneObjectPart(SceneObjectGroup parent, int creationDate, UUID ownerID,
-            UUID creatorID, UUID lastOwnerID, PrimitiveBaseShape shape,
-            Vector3 position, Quaternion rotation, uint flags)
-        {
-            m_parentGroup = parent;
-            TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
-            _creationDate = creationDate;
-            _ownerID = ownerID;
-            _creatorID = creatorID;
-            _lastOwnerID = lastOwnerID;
-            UUID = UUID.Random();
-            Shape = shape;
-            _ownershipCost = 0;
-            _objectSaleType = (byte) 0;
-            _salePrice = 0;
-            _category = (uint) 0;
-            _lastOwnerID = _creatorID;
-            OffsetPosition = position;
-            RotationOffset = rotation;
-            ObjectFlags = flags;
-
-            Rezzed = DateTime.Now;
-
-            m_TextureAnimation = new byte[0];
-            m_particleSystem = new byte[0];
-            // Since we don't store script state, this is only a 'temporary' objectflag now
-            // If the object is scripted, the script will get loaded and this will be set again
-            ObjectFlags &= ~(uint)(PrimFlags.Scripted | PrimFlags.Touch);
-
-            TrimPermissions();
-            // ApplyPhysics();
-        }
-
         protected SceneObjectPart(SerializationInfo info, StreamingContext context)
         {
             //System.Console.WriteLine("SceneObjectPart Deserialize BGN");
@@ -3056,7 +3004,6 @@ if (m_shape != null) {
 
         public void UpdatePrimFlags(bool UsePhysics, bool IsTemporary, bool IsPhantom)
         {
-
             bool wasUsingPhysics = ((ObjectFlags & (uint) PrimFlags.Physics) != 0);
             bool wasTemporary = ((ObjectFlags & (uint)PrimFlags.TemporaryOnRez) != 0);
             bool wasPhantom = ((ObjectFlags & (uint)PrimFlags.Phantom) != 0);
-- 
cgit v1.1