aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-21 18:46:44 +0000
committerJustin Clarke Casey2009-01-21 18:46:44 +0000
commitd2d273aebe3a78eaff52d8bf3bbf21cfc8319654 (patch)
tree4103dacd85557909940f606ad45bbc13c514da37
parentminor: find in existing senderUUID field for chat messages originating from a... (diff)
downloadopensim-SC-d2d273aebe3a78eaff52d8bf3bbf21cfc8319654.zip
opensim-SC-d2d273aebe3a78eaff52d8bf3bbf21cfc8319654.tar.gz
opensim-SC-d2d273aebe3a78eaff52d8bf3bbf21cfc8319654.tar.bz2
opensim-SC-d2d273aebe3a78eaff52d8bf3bbf21cfc8319654.tar.xz
* minor: move connection success log message so that it doesn't get printed again if a duplicate use circuit code packet comes in
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs2
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 8189501..1615767 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -442,11 +442,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
442 } 442 }
443 443
444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); 444 m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy);
445 } 445
446 446 m_log.DebugFormat(
447 m_log.DebugFormat( 447 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}",
448 "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", 448 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName);
449 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); 449 }
450 } 450 }
451 451
452 // Ack the UseCircuitCode packet 452 // Ack the UseCircuitCode packet
@@ -459,7 +459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
459 ack_it.Header.Sequence = ((useCircuit.Header.Sequence < uint.MaxValue) ? useCircuit.Header.Sequence : 0) + 1; 459 ack_it.Header.Sequence = ((useCircuit.Header.Sequence < uint.MaxValue) ? useCircuit.Header.Sequence : 0) + 1;
460 ack_it.Header.Reliable = false; 460 ack_it.Header.Reliable = false;
461 461
462 byte[] ackmsg=ack_it.ToBytes(); 462 byte[] ackmsg = ack_it.ToBytes();
463 463
464 // Need some extra space in case we need to add proxy 464 // Need some extra space in case we need to add proxy
465 // information to the message later 465 // information to the message later
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 74f5dc7..596862b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -726,7 +726,7 @@ namespace OpenSim.Region.Environment.Scenes
726 if (reg != null) 726 if (reg != null)
727 { 727 {
728 m_log.DebugFormat( 728 m_log.DebugFormat(
729 "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}", 729 "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} in {1}",
730 position, reg.RegionName); 730 position, reg.RegionName);
731 731
732 if (eq == null) 732 if (eq == null)