* ObjectAddPacket now confined to ClientView,´using PrimitiveBaseShape instead - w00t!

1 files changed, 2 insertions, 19 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 4a4b7a0..417f817 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -417,22 +417,12 @@ namespace OpenSim.Region.Environment.Scenes
         /// 

         /// </summary>

         /// <param name="addPacket"></param>

-        /// <param name="agentClient"></param>

-        public void AddNewPrim(Packet addPacket, IClientAPI agentClient)

-        {

-            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="addPacket"></param>

         /// <param name="ownerID"></param>

-        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)

+        public void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape)

         {

             try

             {

-                SceneObject sceneOb = new SceneObject(m_regionHandle, this, addPacket, ownerID, this.PrimIDAllocate());

+                SceneObject sceneOb = new SceneObject(m_regionHandle, this, ownerID, this.PrimIDAllocate(), pos, shape);

                 this.Entities.Add(sceneOb.rootUUID, sceneOb);

 

                 // Trigger event for listeners

@@ -444,13 +434,6 @@ namespace OpenSim.Region.Environment.Scenes
             }

         }

 

-        public override uint AddNewPrim(LLUUID ownerId, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID texture, int flags)

-        {

-            uint id = NextLocalId;

-            

-            throw new NotImplementedException("Not implemented yet.");                       

-        }

-

         #endregion

 

         #region Add/Remove Avatar Methods