aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2014-09-14 20:46:22 +0200
committerMelanie Thielker2014-09-14 20:46:22 +0200
commitd43d3df724b62d0bf2765f25794e83dacd6c60c1 (patch)
tree9820834d5e0908e54d0700e1f93ce2d9a4719dae /OpenSim/Region/ClientStack
parentrevert changes to m_pendingCache and remove client close if there is no (diff)
downloadopensim-SC_OLD-d43d3df724b62d0bf2765f25794e83dacd6c60c1.zip
opensim-SC_OLD-d43d3df724b62d0bf2765f25794e83dacd6c60c1.tar.gz
opensim-SC_OLD-d43d3df724b62d0bf2765f25794e83dacd6c60c1.tar.bz2
opensim-SC_OLD-d43d3df724b62d0bf2765f25794e83dacd6c60c1.tar.xz
Reinstate closing the client if CloseAgen returns false. This was part
of the last Ubit patch.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index d811b64..3539100 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -2063,7 +2063,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2063 client.Kick("Simulator logged you out due to connection timeout."); 2063 client.Kick("Simulator logged you out due to connection timeout.");
2064 } 2064 }
2065 2065
2066 m_scene.CloseAgent(client.AgentId, true); 2066 if (!m_scene.CloseAgent(client.AgentId, true))
2067 client.Close(true,true);
2067 } 2068 }
2068 2069
2069 private void IncomingPacketHandler() 2070 private void IncomingPacketHandler()