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

2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index b47d95a..2be5b0e 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack
         public event ObjectSelect OnDeGrapObject;

         public event ObjectDuplicate OnObjectDuplicate;

         public event MoveObject OnGrapUpdate;

-        public event GenericCall4 OnAddPrim;

+        public event AddNewPrim OnAddPrim;

         public event UpdateShape OnUpdatePrimShape;

         public event ObjectSelect OnObjectSelect;

         public event GenericCall7 OnObjectDescription;

diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index df2bf34..013b755 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -217,7 +217,10 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.ObjectAdd:

                         if (OnAddPrim != null)

                         {

-                            OnAddPrim(Pack, this);

+                            ObjectAddPacket packet = (ObjectAddPacket) Pack ;

+                            PrimitiveBaseShape primShape = PrimitiveBaseShape.FromAddPacket( packet );

+

+                            OnAddPrim(this.AgentId, packet.ObjectData.RayEnd, primShape );

                         }

                         break;

                     case PacketType.ObjectShape: