Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-09-17 21:48:36 +01:00
commit 6e015125c5
1 changed files with 8 additions and 5 deletions

View File

@ -2055,12 +2055,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
ClientLogoutsDueToNoReceives++;
m_log.WarnFormat(
"[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.",
client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
if (client.SceneAgent != null)
{
m_log.WarnFormat(
"[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.",
client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
if (client.SceneAgent != null && !client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout.");
if (!client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout.");
}
}
if (!m_scene.CloseAgent(client.AgentId, true))