aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
diff options
context:
space:
mode:
authorMelanie2010-03-03 02:07:03 +0000
committerMelanie2010-03-03 02:07:03 +0000
commit028a87fe37002e7a0611f66babf1deee46c83804 (patch)
tree387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
parentRevert "test" (diff)
parentFixes Region.Framework tests. Although these tests don't fail, they need to b... (diff)
downloadopensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2
opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 3c4fa72..36d24e8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -596,15 +596,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
596 } 596 }
597 catch (MalformedDataException) 597 catch (MalformedDataException)
598 { 598 {
599 m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse packet from {0}:\n{1}",
600 buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
601 } 599 }
602 600
603 // Fail-safe check 601 // Fail-safe check
604 if (packet == null) 602 if (packet == null)
605 { 603 {
606 m_log.Warn("[LLUDPSERVER]: Couldn't build a message from incoming data " + buffer.DataLength + 604 m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}:",
607 " bytes long from " + buffer.RemoteEndPoint); 605 buffer.DataLength, buffer.RemoteEndPoint);
606 m_log.Error(Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
608 return; 607 return;
609 } 608 }
610 609
@@ -919,7 +918,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
919 // Remove this client from the scene 918 // Remove this client from the scene
920 IClientAPI client; 919 IClientAPI client;
921 if (m_scene.TryGetClient(udpClient.AgentID, out client)) 920 if (m_scene.TryGetClient(udpClient.AgentID, out client))
921 {
922 client.IsLoggingOut = true;
922 client.Close(); 923 client.Close();
924 }
923 } 925 }
924 926
925 private void IncomingPacketHandler() 927 private void IncomingPacketHandler()