diff options
| author | Melanie | 2012-01-25 00:45:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-25 00:45:57 +0000 |
| commit | 427ab55058128c3cebd5ebd5e3aed93bc4337a2b (patch) | |
| tree | e50bf3ef199b3aeb208ce3cabbd242e10e65c8ca /OpenSim/Region/ClientStack | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make errors reported by OpenSim when it halts because it can't find certain c... (diff) | |
| download | opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.zip opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.gz opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.bz2 opensim-SC_OLD-427ab55058128c3cebd5ebd5e3aed93bc4337a2b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index bf5b85a..3139112 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -492,6 +492,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 492 | if ((Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > 1000 * 60) | 492 | if ((Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > 1000 * 60) |
| 493 | { | 493 | { |
| 494 | m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID); | 494 | m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + udpClient.AgentID); |
| 495 | StatsManager.SimExtraStats.AddAbnormalClientThreadTermination(); | ||
| 495 | 496 | ||
| 496 | RemoveClient(udpClient); | 497 | RemoveClient(udpClient); |
| 497 | return; | 498 | return; |