aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-01-06 17:42:16 -0800
committerDiva Canto2011-01-06 17:42:16 -0800
commit32a3f330eddfe2975e59ae7289b6a0033fb858e3 (patch)
tree056cd3750226b7b35009701e8780e02700ebdb86 /OpenSim
parentDeal with possibly un-initialized scripts in object transfers. Mantis #5310 (diff)
downloadopensim-SC_OLD-32a3f330eddfe2975e59ae7289b6a0033fb858e3.zip
opensim-SC_OLD-32a3f330eddfe2975e59ae7289b6a0033fb858e3.tar.gz
opensim-SC_OLD-32a3f330eddfe2975e59ae7289b6a0033fb858e3.tar.bz2
opensim-SC_OLD-32a3f330eddfe2975e59ae7289b6a0033fb858e3.tar.xz
Canonicalize URL endings for the UserAgentServiceConnector.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 7ddcfa6..c40a347 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -60,7 +60,9 @@ namespace OpenSim.Services.Connectors.Hypergrid
60 { 60 {
61 Uri m_Uri = new Uri(m_ServerURL); 61 Uri m_Uri = new Uri(m_ServerURL);
62 IPAddress ip = Util.GetHostFromDNS(m_Uri.Host); 62 IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
63 m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); ; 63 m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString());
64 if (!m_ServerURL.EndsWith("/"))
65 m_ServerURL += "/";
64 } 66 }
65 catch (Exception e) 67 catch (Exception e)
66 { 68 {
@@ -87,6 +89,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
87 throw new Exception("UserAgent connector init error"); 89 throw new Exception("UserAgent connector init error");
88 } 90 }
89 m_ServerURL = serviceURI; 91 m_ServerURL = serviceURI;
92 if (!m_ServerURL.EndsWith("/"))
93 m_ServerURL += "/";
90 94
91 m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL); 95 m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
92 } 96 }