From f64d94f8caccd49523c54c48a1c6700b7fb0d212 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 28 Dec 2007 14:24:14 +0000
Subject: * Rezzing items from Inventory on top of other prim rezzes them 0.5
 meters above the 'hit' prim instead of buried in the ground somewhere. *
 Various Refactorings

---
 OpenSim/Region/ClientStack/ClientView.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index aed2c29..0d3c07e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -2560,8 +2560,19 @@ namespace OpenSim.Region.ClientStack
                             //rezPacket.RezData.RemoveItem;
                             //rezPacket.RezData.RezSelected;
                             //rezPacket.RezData.FromTaskID;
+                            //rezPacket.RezData.FromTaskID;
+                            //rezPacket.RezData.EveryoneMask;
+                            //rezPacket.RezData.GroupMask;
+                            //rezPacket.RezData.NextOwnerMask;
+                            
                             //MainLog.Instance.Verbose("REZData", rezPacket.ToString());
-                            OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd);
+                            OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, 
+                                        rezPacket.RezData.RayStart,rezPacket.RezData.RayTargetID,
+                                        rezPacket.RezData.BypassRaycast,rezPacket.RezData.RayEndIsIntersection,
+                                        rezPacket.RezData.EveryoneMask,rezPacket.RezData.GroupMask,
+                                        rezPacket.RezData.NextOwnerMask,rezPacket.RezData.ItemFlags,
+                                        rezPacket.RezData.RezSelected,rezPacket.RezData.RemoveItem,
+                                        rezPacket.RezData.FromTaskID);
                         }
                         break;
                     case PacketType.DeRezObject:
@@ -2740,12 +2751,6 @@ namespace OpenSim.Region.ClientStack
                         {
                             ObjectAddPacket addPacket = (ObjectAddPacket) Pack;
                             PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket);
-                            MainLog.Instance.Verbose("REZData", addPacket.ToString());
-                            //BypassRaycast: 1
-                            //RayStart: <69.79469, 158.2652, 98.40343>
-                            //RayEnd: <61.97724, 141.995, 92.58341>   
-                            //RayTargetID: 00000000-0000-0000-0000-000000000000
-
                             OnAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape,addPacket.ObjectData.BypassRaycast,addPacket.ObjectData.RayStart,addPacket.ObjectData.RayTargetID,addPacket.ObjectData.RayEndIsIntersection);
                         }
                         break;
-- 
cgit v1.1