From d2d273aebe3a78eaff52d8bf3bbf21cfc8319654 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 21 Jan 2009 18:46:44 +0000 Subject: [PATCH] * minor: move connection success log message so that it doesn't get printed again if a duplicate use circuit code packet comes in --- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 12 ++++++------ .../Environment/Scenes/SceneCommunicationService.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 8189501898..1615767071 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -442,11 +442,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP } m_packetServer.AddNewClient(epSender, useCircuit, m_assetCache, sessionInfo, epProxy); - } - - m_log.DebugFormat( - "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", - useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); + + m_log.DebugFormat( + "[CONNECTION SUCCESS]: Incoming client {0} (circuit code {1}) received and authenticated for {2}", + useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code, m_localScene.RegionInfo.RegionName); + } } // Ack the UseCircuitCode packet @@ -459,7 +459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP ack_it.Header.Sequence = ((useCircuit.Header.Sequence < uint.MaxValue) ? useCircuit.Header.Sequence : 0) + 1; ack_it.Header.Reliable = false; - byte[] ackmsg=ack_it.ToBytes(); + byte[] ackmsg = ack_it.ToBytes(); // Need some extra space in case we need to add proxy // information to the message later diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 74f5dc73ec..596862b44e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -726,7 +726,7 @@ namespace OpenSim.Region.Environment.Scenes if (reg != null) { m_log.DebugFormat( - "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}", + "[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} in {1}", position, reg.RegionName); if (eq == null)