diff options
author | Justin Clarke Casey | 2008-11-01 21:28:52 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-01 21:28:52 +0000 |
commit | b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8 (patch) | |
tree | d0e0af8fe1a69864a0ab707cb664825f6c393914 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Make the IM and friends modules optional. Clean up some code that dealt (diff) | |
download | opensim-SC_OLD-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.zip opensim-SC_OLD-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.gz opensim-SC_OLD-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.bz2 opensim-SC_OLD-b03e34dd2de8e58f3aaf61dbac71d1e8f99313e8.tar.xz |
* Fix http://opensimulator.org/mantis/view.php?id=2517
* Don't save attachments on saving oar, which stops them coming back as ghost prims
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 14 |
1 files changed, 4 insertions, 10 deletions
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 | |||
4129 | handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); | 4129 | handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders); |
4130 | } | 4130 | } |
4131 | break; | 4131 | break; |
4132 | |||
4132 | case PacketType.TerminateFriendship: | 4133 | case PacketType.TerminateFriendship: |
4133 | TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; | 4134 | TerminateFriendshipPacket tfriendpack = (TerminateFriendshipPacket)Pack; |
4134 | UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; | 4135 | UUID listOwnerAgentID = tfriendpack.AgentData.AgentID; |
@@ -4140,22 +4141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4140 | handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); | 4141 | handlerTerminateFriendship(this, listOwnerAgentID, exFriendID); |
4141 | } | 4142 | } |
4142 | break; | 4143 | break; |
4144 | |||
4143 | case PacketType.RezObject: | 4145 | case PacketType.RezObject: |
4144 | RezObjectPacket rezPacket = (RezObjectPacket)Pack; | 4146 | RezObjectPacket rezPacket = (RezObjectPacket)Pack; |
4145 | 4147 | ||
4146 | handlerRezObject = OnRezObject; | 4148 | handlerRezObject = OnRezObject; |
4147 | if (handlerRezObject != null) | 4149 | if (handlerRezObject != null) |
4148 | { | 4150 | { |
4149 | //rezPacket.RezData.BypassRaycast; | ||
4150 | //rezPacket.RezData.RayEnd; | ||
4151 | //rezPacket.RezData.RayEndIsIntersection; | ||
4152 | //rezPacket.RezData.RayStart; | ||
4153 | //rezPacket.RezData.RayTargetID; | ||
4154 | //rezPacket.RezData.RemoveItem; | ||
4155 | //rezPacket.RezData.RezSelected; | ||
4156 | //rezPacket.RezData.FromTaskID; | ||
4157 | //m_log.Info("[REZData]: " + rezPacket.ToString()); | ||
4158 | |||
4159 | handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, | 4151 | handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, |
4160 | rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, | 4152 | rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, |
4161 | rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, | 4153 | rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, |
@@ -4163,6 +4155,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4163 | rezPacket.RezData.FromTaskID); | 4155 | rezPacket.RezData.FromTaskID); |
4164 | } | 4156 | } |
4165 | break; | 4157 | break; |
4158 | |||
4166 | case PacketType.DeRezObject: | 4159 | case PacketType.DeRezObject: |
4167 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; | 4160 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) Pack; |
4168 | handlerDeRezObject = OnDeRezObject; | 4161 | handlerDeRezObject = OnDeRezObject; |
@@ -4178,6 +4171,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4178 | } | 4171 | } |
4179 | } | 4172 | } |
4180 | break; | 4173 | break; |
4174 | |||
4181 | case PacketType.ModifyLand: | 4175 | case PacketType.ModifyLand: |
4182 | ModifyLandPacket modify = (ModifyLandPacket)Pack; | 4176 | ModifyLandPacket modify = (ModifyLandPacket)Pack; |
4183 | //m_log.Info("[LAND]: LAND:" + modify.ToString()); | 4177 | //m_log.Info("[LAND]: LAND:" + modify.ToString()); |