diff options
| author | UbitUmarov | 2014-09-17 21:48:36 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-09-17 21:48:36 +0100 |
| commit | 6e015125c5fe48d64e49ba4731be5536c3982b69 (patch) | |
| tree | 86370c1d9e4e0ae84af2ce48323ef35b6ca9df7b /OpenSim | |
| parent | ... and a few more.. (diff) | |
| parent | Fix a nullref in a debug message. If we have no SceneAgent, we can't output d... (diff) | |
| download | opensim-SC_OLD-6e015125c5fe48d64e49ba4731be5536c3982b69.zip opensim-SC_OLD-6e015125c5fe48d64e49ba4731be5536c3982b69.tar.gz opensim-SC_OLD-6e015125c5fe48d64e49ba4731be5536c3982b69.tar.bz2 opensim-SC_OLD-6e015125c5fe48d64e49ba4731be5536c3982b69.tar.xz | |
Merge branch 'master' into ubitworkmaster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 3539100..99e7aba 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -2055,12 +2055,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2055 | { | 2055 | { |
| 2056 | ClientLogoutsDueToNoReceives++; | 2056 | ClientLogoutsDueToNoReceives++; |
| 2057 | 2057 | ||
| 2058 | m_log.WarnFormat( | 2058 | if (client.SceneAgent != null) |
| 2059 | "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.", | 2059 | { |
| 2060 | client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name); | 2060 | m_log.WarnFormat( |
| 2061 | "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.", | ||
| 2062 | client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name); | ||
| 2061 | 2063 | ||
| 2062 | if (client.SceneAgent != null && !client.SceneAgent.IsChildAgent) | 2064 | if (!client.SceneAgent.IsChildAgent) |
| 2063 | client.Kick("Simulator logged you out due to connection timeout."); | 2065 | client.Kick("Simulator logged you out due to connection timeout."); |
| 2066 | } | ||
| 2064 | } | 2067 | } |
| 2065 | 2068 | ||
| 2066 | if (!m_scene.CloseAgent(client.AgentId, true)) | 2069 | if (!m_scene.CloseAgent(client.AgentId, true)) |