diff options
| author | UbitUmarov | 2017-05-23 07:35:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-23 07:35:02 +0100 |
| commit | c0bfaac0ac6873720b7c3721436ca54e93d5072c (patch) | |
| tree | 62f6b02569ba6dd968d76ad9bf2aa6ccf839d588 /OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |
| parent | reenqueue poll events while conn is open, and not expired (diff) | |
| parent | dont log timeouts on stopped threads (diff) | |
| download | opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.zip opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.gz opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.bz2 opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.xz | |
merge master
Diffstat (limited to 'OpenSim/Server/Handlers/Map/MapAddServerConnector.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index bfd73a2..331dabf 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
| @@ -225,8 +225,8 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 225 | 225 | ||
| 226 | private System.Net.IPAddress GetCallerIP(IOSHttpRequest request) | 226 | private System.Net.IPAddress GetCallerIP(IOSHttpRequest request) |
| 227 | { | 227 | { |
| 228 | if (!m_Proxy) | 228 | // if (!m_Proxy) |
| 229 | return request.RemoteIPEndPoint.Address; | 229 | // return request.RemoteIPEndPoint.Address; |
| 230 | 230 | ||
| 231 | // We're behind a proxy | 231 | // We're behind a proxy |
| 232 | string xff = "X-Forwarded-For"; | 232 | string xff = "X-Forwarded-For"; |
| @@ -236,7 +236,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
| 236 | 236 | ||
| 237 | if (xffValue == null || (xffValue != null && xffValue == string.Empty)) | 237 | if (xffValue == null || (xffValue != null && xffValue == string.Empty)) |
| 238 | { | 238 | { |
| 239 | m_log.WarnFormat("[MAP IMAGE HANDLER]: No XFF header"); | 239 | // m_log.WarnFormat("[MAP IMAGE HANDLER]: No XFF header"); |
| 240 | return request.RemoteIPEndPoint.Address; | 240 | return request.RemoteIPEndPoint.Address; |
| 241 | } | 241 | } |
| 242 | 242 | ||