diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0e17496..393cd03 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5222,11 +5222,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5222 | } | 5222 | } |
5223 | catch (Exception e) | 5223 | catch (Exception e) |
5224 | { | 5224 | { |
5225 | m_log.Error("[GENERICMESSAGE] " + e); | 5225 | m_log.ErrorFormat( |
5226 | "[LLCLIENTVIEW]: Exeception when handling generic message {0}{1}", e.Message, e.StackTrace); | ||
5226 | } | 5227 | } |
5227 | } | 5228 | } |
5228 | } | 5229 | } |
5229 | m_log.Error("[GENERICMESSAGE] Not handling GenericMessage with method-type of: " + method); | 5230 | |
5231 | //m_log.Debug("[LLCLIENTVIEW]: Not handling GenericMessage with method-type of: " + method); | ||
5230 | return false; | 5232 | return false; |
5231 | } | 5233 | } |
5232 | 5234 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 209e35c..5aeca83 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; |