aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-22 22:21:20 +0000
committerMelanie Thielker2008-07-22 22:21:20 +0000
commit7fb103d374ea96832c1787406e96500f6cd16a2b (patch)
treee819f6ffa7d45d00a60cf108aca8f8bbde7af7e4
parentrenamed ScenePresence.SendFullUpdateToAllClients() to SendInitialFullUpdateTo... (diff)
downloadopensim-SC-7fb103d374ea96832c1787406e96500f6cd16a2b.zip
opensim-SC-7fb103d374ea96832c1787406e96500f6cd16a2b.tar.gz
opensim-SC-7fb103d374ea96832c1787406e96500f6cd16a2b.tar.bz2
opensim-SC-7fb103d374ea96832c1787406e96500f6cd16a2b.tar.xz
Change one packet optimization to cover a case where the resend
queue may block indefinitely when a single packet is not acked by the viewer and no others cwfromfor that region are pending.
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 1ec375f..c4bc6c8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -309,8 +309,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
309 // No need to resend anything. Keep it until it gets stale, 309 // No need to resend anything. Keep it until it gets stale,
310 // then it will be dropped. 310 // then it will be dropped.
311 // 311 //
312 if (((now - lastAck) > m_SilenceLimit) && 312 if ((((now - lastAck) > m_SilenceLimit) &&
313 m_NeedAck.Count > 0) 313 m_NeedAck.Count > 0) || m_NeedAck.Count == 0)
314 { 314 {
315 return; 315 return;
316 } 316 }