From 585f9f0d549e5ef9f4040de206a2376528d2c63f Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 12 Jun 2007 15:53:19 +0000
Subject: Work on Primitive class.

---
 OpenSim/OpenSim.Region/World/Entities/Primitive.cs | 23 +++++++++++++++++++---
 .../OpenSim.Region/World/Entities/SceneObject.cs   |  3 +--
 OpenSim/OpenSim.Region/World/World.cs              |  3 +--
 3 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'OpenSim/OpenSim.Region')

diff --git a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
index 0680eb3..3d915a1 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region
         /// <param name="clientThreads"></param>
         /// <param name="regionHandle"></param>
         /// <param name="world"></param>
-        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world)
+        public Primitive( ulong regionHandle, World world)
         {
            // m_clientThreads = clientThreads;
             m_regionHandle = regionHandle;
@@ -104,13 +104,30 @@ namespace OpenSim.Region
         /// <summary>
         /// 
         /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="world"></param>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="localID"></param>
+        public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            // m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.CreateFromPacket(addPacket, ownerID, localID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
         /// <param name="clientThreads"></param>
         /// <param name="regionHandle"></param>
         /// <param name="world"></param>
         /// <param name="owner"></param>
         /// <param name="fullID"></param>
         /// <param name="localID"></param>
-        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
+        public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
         {
           //  m_clientThreads = clientThreads;
             m_regionHandle = regionHandle;
@@ -132,7 +149,7 @@ namespace OpenSim.Region
         /// <param name="owner"></param>
         /// <param name="localID"></param>
         /// <param name="position"></param>
-        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
+        public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
         {
             //m_clientThreads = clientThreads;
             m_regionHandle = regionHandle;
diff --git a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
index 6ded881..558dc6b 100644
--- a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
@@ -62,8 +62,7 @@ namespace OpenSim.Region
         /// <param name="localID"></param>
         public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
         {
-            this.rootPrimitive = new Primitive(null, this.regionHandle, this.m_world);
-            this.rootPrimitive.CreateFromPacket(addPacket, agentID, localID);
+            this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
         }
 
         /// <summary>
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index 8c1493e..40eb7ef 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -482,8 +482,7 @@ namespace OpenSim.Region
             try
             {
                // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
-                Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
-                prim.CreateFromPacket(addPacket, ownerID, this._primCount);
+                Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
                 
                 this.Entities.Add(prim.uuid, prim);
                 this._primCount++;
-- 
cgit v1.1