diff options
| author | UbitUmarov | 2017-05-31 07:21:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-31 07:21:21 +0100 |
| commit | 55babdc16090397499081f0428500babe383ff3a (patch) | |
| tree | efb2f7ec13abba489d6318ebace8a86c6cde66c6 /OpenSim/Services/Connectors/Hypergrid | |
| parent | disable llhttprequests secure con, since it still collides with main ssl sett... (diff) | |
| parent | we don't need to keep refs to baked textures assets (diff) | |
| download | opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index b261675..f2bb52a 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -70,9 +70,14 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 70 | { | 70 | { |
| 71 | Uri m_Uri = new Uri(m_ServerURL); | 71 | Uri m_Uri = new Uri(m_ServerURL); |
| 72 | IPAddress ip = Util.GetHostFromDNS(m_Uri.Host); | 72 | IPAddress ip = Util.GetHostFromDNS(m_Uri.Host); |
| 73 | m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); | 73 | if(ip != null) |
| 74 | if (!m_ServerURL.EndsWith("/")) | 74 | { |
| 75 | m_ServerURL += "/"; | 75 | m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); |
| 76 | if (!m_ServerURL.EndsWith("/")) | ||
| 77 | m_ServerURL += "/"; | ||
| 78 | } | ||
| 79 | else | ||
| 80 | m_log.DebugFormat("[USER AGENT CONNECTOR]: Failed to resolv address of {0}", url); | ||
| 76 | } | 81 | } |
| 77 | catch (Exception e) | 82 | catch (Exception e) |
| 78 | { | 83 | { |