aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-29 23:38:54 +0100
committerJustin Clark-Casey (justincc)2013-07-29 23:38:54 +0100
commit8004e6f31cb03abc9b6170622099879ccaf5570b (patch)
tree0187bda6a134eb4df1c368616f99692010fa6df7 /OpenSim
parentMake "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and a... (diff)
downloadopensim-SC_OLD-8004e6f31cb03abc9b6170622099879ccaf5570b.zip
opensim-SC_OLD-8004e6f31cb03abc9b6170622099879ccaf5570b.tar.gz
opensim-SC_OLD-8004e6f31cb03abc9b6170622099879ccaf5570b.tar.bz2
opensim-SC_OLD-8004e6f31cb03abc9b6170622099879ccaf5570b.tar.xz
Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac where I accidentally left in a test line to force very quick client unack
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 9e6a401..bf50868 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1053 timeoutTicks = m_pausedAckTimeout; 1053 timeoutTicks = m_pausedAckTimeout;
1054 1054
1055 if (client.IsActive && 1055 if (client.IsActive &&
1056 (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > -1) 1056 (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > timeoutTicks)
1057 { 1057 {
1058 // We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even 1058 // We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
1059 // though it's set later on by LLClientView.Close() 1059 // though it's set later on by LLClientView.Close()