2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 460938e..d2cd6d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -500,7 +500,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             RTO = (int)(SRTT + Math.Max(m_udpServer.TickCountResolution, K * RTTVAR));
 
             // Clamp the retransmission timeout to manageable values
-            RTO = Utils.Clamp(RTO, 3000, 10000);
+            RTO = Utils.Clamp(RTO, 3000, 60000);
 
             //m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " +
             //    RTTVAR + " based on new RTT of " + r + "ms");
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 2973d4b..7e929e5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -407,6 +407,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 //m_log.Debug("[LLUDPSERVER]: Resending " + expiredPackets.Count + " packets to " + udpClient.AgentID + ", RTO=" + udpClient.RTO);
 
+                // Backoff the RTO
+                udpClient.RTO = Math.Min(udpClient.RTO * 2, 60000);
+
                 // Resend packets
                 for (int i = 0; i < expiredPackets.Count; i++)
                 {