diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index d5b061b..ae8251a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -324,7 +324,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
324 | /// <param name="packet"></param> | 324 | /// <param name="packet"></param> |
325 | /// <param name="category"></param> | 325 | /// <param name="category"></param> |
326 | /// <param name="allowSplitting"></param> | 326 | /// <param name="allowSplitting"></param> |
327 | public void SendPacket(LLUDPClient udpClient, Packet packet, ThrottleOutPacketType category, bool allowSplitting, UnackedPacketMethod method) | 327 | /// <param name="method"> |
328 | /// The method to call if the packet is not acked by the client. If null, then a standard | ||
329 | /// resend of the packet is done. | ||
330 | /// </param> | ||
331 | public void SendPacket( | ||
332 | LLUDPClient udpClient, Packet packet, ThrottleOutPacketType category, bool allowSplitting, UnackedPacketMethod method) | ||
328 | { | 333 | { |
329 | // CoarseLocationUpdate packets cannot be split in an automated way | 334 | // CoarseLocationUpdate packets cannot be split in an automated way |
330 | if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting) | 335 | if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting) |
@@ -357,8 +362,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
357 | /// <param name="udpClient"></param> | 362 | /// <param name="udpClient"></param> |
358 | /// <param name="data"></param> | 363 | /// <param name="data"></param> |
359 | /// <param name="type"></param> | 364 | /// <param name="type"></param> |
360 | /// <param name="category"></param> | 365 | /// <param name="category"></param> |
361 | public void SendPacketData(LLUDPClient udpClient, byte[] data, PacketType type, ThrottleOutPacketType category, UnackedPacketMethod method) | 366 | /// <param name="method"> |
367 | /// The method to call if the packet is not acked by the client. If null, then a standard | ||
368 | /// resend of the packet is done. | ||
369 | /// </param> | ||
370 | public void SendPacketData( | ||
371 | LLUDPClient udpClient, byte[] data, PacketType type, ThrottleOutPacketType category, UnackedPacketMethod method) | ||
362 | { | 372 | { |
363 | int dataLength = data.Length; | 373 | int dataLength = data.Length; |
364 | bool doZerocode = (data[0] & Helpers.MSG_ZEROCODED) != 0; | 374 | bool doZerocode = (data[0] & Helpers.MSG_ZEROCODED) != 0; |
@@ -1102,7 +1112,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1102 | { | 1112 | { |
1103 | m_log.Error("[LLUDPSERVER]: OutgoingPacketHandler loop threw an exception: " + ex.Message, ex); | 1113 | m_log.Error("[LLUDPSERVER]: OutgoingPacketHandler loop threw an exception: " + ex.Message, ex); |
1104 | } | 1114 | } |
1105 | |||
1106 | } | 1115 | } |
1107 | 1116 | ||
1108 | Watchdog.RemoveThread(); | 1117 | Watchdog.RemoveThread(); |