diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index d885e3b..149fa9a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |||
@@ -109,6 +109,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
109 | 109 | ||
110 | public Packet Packet; | 110 | public Packet Packet; |
111 | public Object Identifier; | 111 | public Object Identifier; |
112 | public int TickCount; | ||
112 | } | 113 | } |
113 | 114 | ||
114 | private Dictionary<uint, AckData> m_NeedAck = | 115 | private Dictionary<uint, AckData> m_NeedAck = |
@@ -293,12 +294,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
293 | Packet packet, ThrottleOutPacketType throttlePacketType, | 294 | Packet packet, ThrottleOutPacketType throttlePacketType, |
294 | Object id) | 295 | Object id) |
295 | { | 296 | { |
296 | packet.TickCount = System.Environment.TickCount; | ||
297 | |||
298 | LLQueItem item = new LLQueItem(); | 297 | LLQueItem item = new LLQueItem(); |
299 | item.Packet = packet; | 298 | item.Packet = packet; |
300 | item.Incoming = false; | 299 | item.Incoming = false; |
301 | item.throttleType = throttlePacketType; | 300 | item.throttleType = throttlePacketType; |
301 | item.TickCount = System.Environment.TickCount; | ||
302 | item.Identifier = id; | 302 | item.Identifier = id; |
303 | 303 | ||
304 | m_PacketQueue.Enqueue(item); | 304 | m_PacketQueue.Enqueue(item); |
@@ -341,7 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
341 | 341 | ||
342 | // Packets this old get resent | 342 | // Packets this old get resent |
343 | // | 343 | // |
344 | if ((now - packet.TickCount) > m_ResendTimeout) | 344 | if ((now - data.TickCount) > m_ResendTimeout) |
345 | { | 345 | { |
346 | // Resend the packet. Set the packet's tick count to | 346 | // Resend the packet. Set the packet's tick count to |
347 | // now, and keep it marked as resent. | 347 | // now, and keep it marked as resent. |
@@ -357,7 +357,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
357 | // pipes. Most likely, the client is gone | 357 | // pipes. Most likely, the client is gone |
358 | // Drop the packets | 358 | // Drop the packets |
359 | // | 359 | // |
360 | if ((now - packet.TickCount) > m_DiscardTimeout) | 360 | if ((now - data.TickCount) > m_DiscardTimeout) |
361 | { | 361 | { |
362 | if (!m_ImportantPackets.Contains(packet.Type)) | 362 | if (!m_ImportantPackets.Contains(packet.Type)) |
363 | m_NeedAck.Remove(packet.Header.Sequence); | 363 | m_NeedAck.Remove(packet.Header.Sequence); |
@@ -729,7 +729,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
729 | Packet packet = item.Packet; | 729 | Packet packet = item.Packet; |
730 | 730 | ||
731 | // Keep track of when this packet was sent out | 731 | // Keep track of when this packet was sent out |
732 | packet.TickCount = System.Environment.TickCount; | 732 | item.TickCount = System.Environment.TickCount; |
733 | 733 | ||
734 | // Assign sequence number here to prevent out of order packets | 734 | // Assign sequence number here to prevent out of order packets |
735 | if (packet.Header.Sequence == 0) | 735 | if (packet.Header.Sequence == 0) |