diff options
author | Justin Clarke Casey | 2008-10-06 16:57:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-06 16:57:58 +0000 |
commit | d18aff33108799680088b40ed1e49b99e5465c13 (patch) | |
tree | 9255c4b56025486af057e913b318c1e7cef88675 /OpenSim/Region | |
parent | * Change interpretation of asset throttle values to bits per second rather th... (diff) | |
download | opensim-SC-d18aff33108799680088b40ed1e49b99e5465c13.zip opensim-SC-d18aff33108799680088b40ed1e49b99e5465c13.tar.gz opensim-SC-d18aff33108799680088b40ed1e49b99e5465c13.tar.bz2 opensim-SC-d18aff33108799680088b40ed1e49b99e5465c13.tar.xz |
* restore Header.Resent field setting for resent packets
* without this, the client appears to reset the sequence of packets its expecting
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index 4c92859..cce3399 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | |||
@@ -362,6 +362,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
362 | if ((now - data.TickCount) > m_ResendTimeout) | 362 | if ((now - data.TickCount) > m_ResendTimeout) |
363 | { | 363 | { |
364 | m_NeedAck[packet.Header.Sequence].Resends++; | 364 | m_NeedAck[packet.Header.Sequence].Resends++; |
365 | |||
366 | // The client needs to be told that a packet is being resent, otherwise it appears to believe | ||
367 | // that it should reset its sequence to that packet number. | ||
368 | packet.Header.Resent = true; | ||
365 | 369 | ||
366 | if (m_NeedAck[packet.Header.Sequence].Resends >= | 370 | if (m_NeedAck[packet.Header.Sequence].Resends >= |
367 | m_MaxReliableResends && (!m_ReliableIsImportant)) | 371 | m_MaxReliableResends && (!m_ReliableIsImportant)) |