Merge branch 'master' into careminster-presence-refactor

2 files changed, 7 insertions, 16 deletions

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 8d0f7be..77e3b20 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -86,13 +86,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
-            IPEndPoint ext = info.ExternalEndPoint;
-            string uri = "";
-            if (ext != null)
-            {
-                uri = "http://" + ext.Address + ":" + info.HttpPort + "/";
-            }
-            //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
+            string uri = "http://" + ((info.ServerURI == string.Empty) ? info.ExternalEndPoint.Address + ":" + info.HttpPort + "/" : info.ServerURI);
+            m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri);
             XmlRpcResponse response = null;
             try
             {
@@ -193,12 +188,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             paramList.Add(hash);
 
             XmlRpcRequest request = new XmlRpcRequest("get_region", paramList);
-            IPEndPoint ext = gatekeeper.ExternalEndPoint;
-            string uri = "";
-            if (ext != null)
-            {
-                uri = "http://" + ext.Address + ":" + gatekeeper.HttpPort + "/";
-            }
+            string uri = "http://" + ((gatekeeper.ServerURI == string.Empty) ? gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/" : gatekeeper.ServerURI);
             m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri);
             XmlRpcResponse response = null;
             try
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 4501937..7fa086a 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -51,15 +51,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
             MethodBase.GetCurrentMethod().DeclaringType);
 
         string m_ServerURL;
-        Uri m_Uri;
         public UserAgentServiceConnector(string url)
         {
             m_ServerURL = url;
+            // Doing this here, because XML-RPC or mono have some strong ideas about
+            // caching DNS translations.
             try
             {
-                m_Uri = new Uri(m_ServerURL);
+                Uri m_Uri = new Uri(m_ServerURL);
                 IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
-                m_ServerURL = "http://" + ip.ToString() + ":" + m_Uri.Port;
+                m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString()); ;
             }
             catch (Exception e)
             {