Fixed DNS resolve bug for Grid mode on multi-Homer systems.

2 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/SimProfileData.cs
index abde1f3..27bbd60 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/SimProfileData.cs
@@ -164,6 +164,7 @@ namespace OpenSim.Framework.Data
             ArrayList SendParams = new ArrayList();
             SendParams.Add(requestData);
             XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
+            Console.WriteLine("Requesting response from GridServer URL: " + gridserver_url);
             XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
 
             Hashtable responseData = (Hashtable)GridResp.Value;
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index a263d7e..fe4ce29 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -249,6 +249,13 @@ namespace OpenSim.Framework.Utilities
         /// <returns>An IP address, or null</returns>
         public static IPAddress GetHostFromDNS(string dnsAddress)
         {
+
+            // Is it already a valid IP? No need to look it up.
+            IPAddress ipa;
+            if (IPAddress.TryParse(dnsAddress, out ipa))
+                return ipa;
+
+            // Not an IP, lookup required
             IPAddress[] hosts = Dns.GetHostEntry(dnsAddress).AddressList;
 
             foreach (IPAddress host in hosts)