diff options
author | Melanie | 2010-09-13 23:35:27 +0100 |
---|---|---|
committer | Melanie | 2010-09-13 23:35:27 +0100 |
commit | b2e50474dcc0e6c762cd3455fef73874e5ce4906 (patch) | |
tree | d0cca66cc22920d9b012e883f30c7a40ab5e05c2 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |
parent | Add a missing parenthesis (diff) | |
parent | Comment out SOG storing debug log message (diff) | |
download | opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.zip opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.gz opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.bz2 opensim-SC-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index ca5a297..56e8c9b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -695,9 +695,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
695 | if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence)) | 695 | if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence)) |
696 | { | 696 | { |
697 | if (packet.Header.Resent) | 697 | if (packet.Header.Resent) |
698 | m_log.Debug("[LLUDPSERVER]: Received a resend of already processed packet #" + packet.Header.Sequence + ", type: " + packet.Type); | 698 | m_log.DebugFormat( |
699 | else | 699 | "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}", |
700 | m_log.Warn("[LLUDPSERVER]: Received a duplicate (not marked as resend) of packet #" + packet.Header.Sequence + ", type: " + packet.Type); | 700 | packet.Header.Sequence, packet.Type, client.Name); |
701 | else | ||
702 | m_log.WarnFormat( | ||
703 | "[LLUDPSERVER]: Received a duplicate (not marked as resend) of packet #{0}, type {1} from {2}", | ||
704 | packet.Header.Sequence, packet.Type, client.Name); | ||
701 | 705 | ||
702 | // Avoid firing a callback twice for the same packet | 706 | // Avoid firing a callback twice for the same packet |
703 | return; | 707 | return; |