From b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 1 Nov 2008 21:28:52 +0000 Subject: * Fix http://opensimulator.org/mantis/view.php?id=2517 * Don't save attachments on saving oar, which stops them coming back as ghost prims --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 07af65d..5b3bc98 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -4129,6 +4129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); } break; + case PacketType.TerminateFriendship: TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; @@ -4140,22 +4141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); } break; + case PacketType.RezObject: RezObjectPacket rezPacket = (RezObjectPacket)Pack; handlerRezObject = OnRezObject; if (handlerRezObject != null) { - //rezPacket.RezData.BypassRaycast; - //rezPacket.RezData.RayEnd; - //rezPacket.RezData.RayEndIsIntersection; - //rezPacket.RezData.RayStart; - //rezPacket.RezData.RayTargetID; - //rezPacket.RezData.RemoveItem; - //rezPacket.RezData.RezSelected; - //rezPacket.RezData.FromTaskID; - //m_log.Info("[REZData]: " + rezPacket.ToString()); - handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, @@ -4163,6 +4155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP rezPacket.RezData.FromTaskID); } break; + case PacketType.DeRezObject: DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; handlerDeRezObject = OnDeRezObject; @@ -4178,6 +4171,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } break; + case PacketType.ModifyLand: ModifyLandPacket modify = (ModifyLandPacket)Pack; //m_log.Info("[LAND]: LAND:" + modify.ToString()); -- cgit v1.1