aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-08-21 00:08:43 +0100
committerUbitUmarov2014-08-21 00:08:43 +0100
commitea1c232f92549d0282532779169ebf4b1811d0c4 (patch)
tree6056699bccabe5ef7c644c55b369d94ee132b7cc
parent reserve updates priority queue 2 for attachments, send them by it on (diff)
downloadopensim-SC_OLD-ea1c232f92549d0282532779169ebf4b1811d0c4.zip
opensim-SC_OLD-ea1c232f92549d0282532779169ebf4b1811d0c4.tar.gz
opensim-SC_OLD-ea1c232f92549d0282532779169ebf4b1811d0c4.tar.bz2
opensim-SC_OLD-ea1c232f92549d0282532779169ebf4b1811d0c4.tar.xz
revert droping udp packet resends after 6 retries, keep resending.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bf44152..3b0312d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1207,16 +1207,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1207 //m_log.DebugFormat("[LLUDPSERVER]: Resending packet #{0} (attempt {1}), {2}ms have passed", 1207 //m_log.DebugFormat("[LLUDPSERVER]: Resending packet #{0} (attempt {1}), {2}ms have passed",
1208 // outgoingPacket.SequenceNumber, outgoingPacket.ResendCount, Environment.TickCount - outgoingPacket.TickCount); 1208 // outgoingPacket.SequenceNumber, outgoingPacket.ResendCount, Environment.TickCount - outgoingPacket.TickCount);
1209 1209
1210 // Bump up the resend count on this packet
1211 Interlocked.Increment(ref outgoingPacket.ResendCount);
1212
1213 // loose packets we retried more than 6 times
1214 // sl says 3 so lets be more tolerant
1215 // we can't not keep hammering with packets a viewer may just beeing ignoring
1216
1217 if (outgoingPacket.ResendCount > 6)
1218 return;
1219
1220 // Set the resent flag 1210 // Set the resent flag
1221 outgoingPacket.Buffer.Data[0] = (byte)(outgoingPacket.Buffer.Data[0] | Helpers.MSG_RESENT); 1211 outgoingPacket.Buffer.Data[0] = (byte)(outgoingPacket.Buffer.Data[0] | Helpers.MSG_RESENT);
1222 outgoingPacket.Category = ThrottleOutPacketType.Resend; 1212 outgoingPacket.Category = ThrottleOutPacketType.Resend;