diff options
| author | Melanie | 2012-06-15 15:59:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-15 15:59:49 +0100 |
| commit | 32cc9c6094b335254e3e44d9d2695d44281d5496 (patch) | |
| tree | 873704e740bda73f3c8178eae7944073790da505 /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Add region name to UseCircuitCode log messages (diff) | |
| download | opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.zip opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.gz opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.bz2 opensim-SC_OLD-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 22cc194..9cce725 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
| @@ -986,8 +986,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 986 | UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1]; | 986 | UseCircuitCodePacket uccp = (UseCircuitCodePacket)array[1]; |
| 987 | 987 | ||
| 988 | m_log.DebugFormat( | 988 | m_log.DebugFormat( |
| 989 | "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} from {1}", | 989 | "[LLUDPSERVER]: Handling UseCircuitCode request for circuit {0} to {1} from IP {2}", |
| 990 | uccp.CircuitCode.Code, buffer.RemoteEndPoint); | 990 | uccp.CircuitCode.Code, m_scene.RegionInfo.RegionName, buffer.RemoteEndPoint); |
| 991 | 991 | ||
| 992 | remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; | 992 | remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; |
| 993 | 993 | ||
| @@ -1016,8 +1016,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 1016 | { | 1016 | { |
| 1017 | // Don't create clients for unauthorized requesters. | 1017 | // Don't create clients for unauthorized requesters. |
| 1018 | m_log.WarnFormat( | 1018 | m_log.WarnFormat( |
| 1019 | "[LLUDPSERVER]: Connection request for client {0} connecting with unnotified circuit code {1} from {2}", | 1019 | "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}", |
| 1020 | uccp.CircuitCode.ID, uccp.CircuitCode.Code, remoteEndPoint); | 1020 | uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, remoteEndPoint); |
| 1021 | } | 1021 | } |
| 1022 | 1022 | ||
| 1023 | // m_log.DebugFormat( | 1023 | // m_log.DebugFormat( |