diff options
author | Teravus Ovares | 2007-12-28 14:24:14 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-28 14:24:14 +0000 |
commit | f64d94f8caccd49523c54c48a1c6700b7fb0d212 (patch) | |
tree | 6373c114a94befc75551953c706490acbca56c8e /OpenSim/Region/ClientStack | |
parent | * Made a copy of parts before updating to avoid dictionary updated exceptions... (diff) | |
download | opensim-SC-f64d94f8caccd49523c54c48a1c6700b7fb0d212.zip opensim-SC-f64d94f8caccd49523c54c48a1c6700b7fb0d212.tar.gz opensim-SC-f64d94f8caccd49523c54c48a1c6700b7fb0d212.tar.bz2 opensim-SC-f64d94f8caccd49523c54c48a1c6700b7fb0d212.tar.xz |
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 19 |
1 files changed, 12 insertions, 7 deletions
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 | |||
2560 | //rezPacket.RezData.RemoveItem; | 2560 | //rezPacket.RezData.RemoveItem; |
2561 | //rezPacket.RezData.RezSelected; | 2561 | //rezPacket.RezData.RezSelected; |
2562 | //rezPacket.RezData.FromTaskID; | 2562 | //rezPacket.RezData.FromTaskID; |
2563 | //rezPacket.RezData.FromTaskID; | ||
2564 | //rezPacket.RezData.EveryoneMask; | ||
2565 | //rezPacket.RezData.GroupMask; | ||
2566 | //rezPacket.RezData.NextOwnerMask; | ||
2567 | |||
2563 | //MainLog.Instance.Verbose("REZData", rezPacket.ToString()); | 2568 | //MainLog.Instance.Verbose("REZData", rezPacket.ToString()); |
2564 | OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd); | 2569 | OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, |
2570 | rezPacket.RezData.RayStart,rezPacket.RezData.RayTargetID, | ||
2571 | rezPacket.RezData.BypassRaycast,rezPacket.RezData.RayEndIsIntersection, | ||
2572 | rezPacket.RezData.EveryoneMask,rezPacket.RezData.GroupMask, | ||
2573 | rezPacket.RezData.NextOwnerMask,rezPacket.RezData.ItemFlags, | ||
2574 | rezPacket.RezData.RezSelected,rezPacket.RezData.RemoveItem, | ||
2575 | rezPacket.RezData.FromTaskID); | ||
2565 | } | 2576 | } |
2566 | break; | 2577 | break; |
2567 | case PacketType.DeRezObject: | 2578 | case PacketType.DeRezObject: |
@@ -2740,12 +2751,6 @@ namespace OpenSim.Region.ClientStack | |||
2740 | { | 2751 | { |
2741 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack; | 2752 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack; |
2742 | PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); | 2753 | PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); |
2743 | MainLog.Instance.Verbose("REZData", addPacket.ToString()); | ||
2744 | //BypassRaycast: 1 | ||
2745 | //RayStart: <69.79469, 158.2652, 98.40343> | ||
2746 | //RayEnd: <61.97724, 141.995, 92.58341> | ||
2747 | //RayTargetID: 00000000-0000-0000-0000-000000000000 | ||
2748 | |||
2749 | OnAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape,addPacket.ObjectData.BypassRaycast,addPacket.ObjectData.RayStart,addPacket.ObjectData.RayTargetID,addPacket.ObjectData.RayEndIsIntersection); | 2754 | OnAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape,addPacket.ObjectData.BypassRaycast,addPacket.ObjectData.RayStart,addPacket.ObjectData.RayTargetID,addPacket.ObjectData.RayEndIsIntersection); |
2750 | } | 2755 | } |
2751 | break; | 2756 | break; |