diff options
author | Teravus Ovares | 2007-12-28 05:25:21 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-28 05:25:21 +0000 |
commit | 67bbed820290b0307f09f29343e5fc96bdfc669a (patch) | |
tree | 154efd468369742724b06589e167b66a6de937ba /OpenSim/Region/ClientStack/ClientView.cs | |
parent | Add missing "System." to System.NullReferenceException (diff) | |
download | opensim-SC-67bbed820290b0307f09f29343e5fc96bdfc669a.zip opensim-SC-67bbed820290b0307f09f29343e5fc96bdfc669a.tar.gz opensim-SC-67bbed820290b0307f09f29343e5fc96bdfc669a.tar.bz2 opensim-SC-67bbed820290b0307f09f29343e5fc96bdfc669a.tar.xz |
* Added ability to create new prim on existing prim (rezzing prim from inventory on other prim coming soon). No more new prim buried in the ground by accident.
* The prim are at the absolute position of the prim you rezzed it on top of + (0,0,0.5) for now.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index b232ed6..e8ae2a7 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -2534,6 +2534,15 @@ namespace OpenSim.Region.ClientStack | |||
2534 | RezObjectPacket rezPacket = (RezObjectPacket) Pack; | 2534 | RezObjectPacket rezPacket = (RezObjectPacket) Pack; |
2535 | if (OnRezObject != null) | 2535 | if (OnRezObject != null) |
2536 | { | 2536 | { |
2537 | //rezPacket.RezData.BypassRaycast; | ||
2538 | //rezPacket.RezData.RayEnd; | ||
2539 | //rezPacket.RezData.RayEndIsIntersection; | ||
2540 | //rezPacket.RezData.RayStart; | ||
2541 | //rezPacket.RezData.RayTargetID; | ||
2542 | //rezPacket.RezData.RemoveItem; | ||
2543 | //rezPacket.RezData.RezSelected; | ||
2544 | //rezPacket.RezData.FromTaskID; | ||
2545 | //MainLog.Instance.Verbose("REZData", rezPacket.ToString()); | ||
2537 | OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd); | 2546 | OnRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd); |
2538 | } | 2547 | } |
2539 | break; | 2548 | break; |
@@ -2713,7 +2722,13 @@ namespace OpenSim.Region.ClientStack | |||
2713 | { | 2722 | { |
2714 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack; | 2723 | ObjectAddPacket addPacket = (ObjectAddPacket) Pack; |
2715 | PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); | 2724 | PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket); |
2716 | OnAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape); | 2725 | MainLog.Instance.Verbose("REZData", addPacket.ToString()); |
2726 | //BypassRaycast: 1 | ||
2727 | //RayStart: <69.79469, 158.2652, 98.40343> | ||
2728 | //RayEnd: <61.97724, 141.995, 92.58341> | ||
2729 | //RayTargetID: 00000000-0000-0000-0000-000000000000 | ||
2730 | |||
2731 | OnAddPrim(AgentId, addPacket.ObjectData.RayEnd, addPacket.ObjectData.Rotation, shape,addPacket.ObjectData.BypassRaycast,addPacket.ObjectData.RayStart,addPacket.ObjectData.RayTargetID,addPacket.ObjectData.RayEndIsIntersection); | ||
2717 | } | 2732 | } |
2718 | break; | 2733 | break; |
2719 | case PacketType.ObjectShape: | 2734 | case PacketType.ObjectShape: |