OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a nullref in a debug message. If we have no SceneAgent, we can't output data from it.

avinationmerge
Melanie Thielker 2014-09-15 23:15:27 +02:00
parent d43d3df724
commit 8014ce7f1a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -2055,12 +2055,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
ClientLogoutsDueToNoReceives++; ClientLogoutsDueToNoReceives++;
m_log.WarnFormat( if (client.SceneAgent != null)
"[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); 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) if (!client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout."); client.Kick("Simulator logged you out due to connection timeout.");
}
} }
if (!m_scene.CloseAgent(client.AgentId, true)) if (!m_scene.CloseAgent(client.AgentId, true))