From d18aff33108799680088b40ed1e49b99e5465c13 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 6 Oct 2008 16:57:58 +0000 Subject: * restore Header.Resent field setting for resent packets * without this, the client appears to reset the sequence of packets its expecting --- OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs | 4 ++++ 1 file changed, 4 insertions(+) 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 if ((now - data.TickCount) > m_ResendTimeout) { m_NeedAck[packet.Header.Sequence].Resends++; + + // The client needs to be told that a packet is being resent, otherwise it appears to believe + // that it should reset its sequence to that packet number. + packet.Header.Resent = true; if (m_NeedAck[packet.Header.Sequence].Resends >= m_MaxReliableResends && (!m_ReliableIsImportant)) -- cgit v1.1