Merge branch 'master' into careminster-presence-refactor

1 files changed, 23 insertions, 12 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 5028206..6ed8a3f 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -51,20 +51,31 @@ namespace OpenSim.Services.Connectors.Hypergrid
             MethodBase.GetCurrentMethod().DeclaringType);
 
         string m_ServerURL;
-        public UserAgentServiceConnector(string url)
+
+        public UserAgentServiceConnector(string url) : this(url, true)
+        {
+        }
+
+        public UserAgentServiceConnector(string url, bool dnsLookup)
         {
             m_ServerURL = url;
-            // Doing this here, because XML-RPC or mono have some strong ideas about
-            // caching DNS translations.
-            try
-            {
-                Uri m_Uri = new Uri(m_ServerURL);
-                IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
-                m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); ;
-            }
-            catch (Exception e)
+
+            if (dnsLookup)
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
+                // Doing this here, because XML-RPC or mono have some strong ideas about
+                // caching DNS translations.
+                try
+                {
+                    Uri m_Uri = new Uri(m_ServerURL);
+                    IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
+                    m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString());
+                    if (!m_ServerURL.EndsWith("/"))
+                        m_ServerURL += "/";
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
+                }
             }
             m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0} ({1})", url, m_ServerURL);
         }
@@ -423,7 +434,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(m_ServerURL, 10000);
+                response = request.Send(m_ServerURL, 4000);
             }
             catch (Exception e)
             {