Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 335c7e7..1749836 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -593,6 +593,7 @@ namespace OpenSim.Services.LLLoginService
 
         private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
         {
+            m_log.Debug("[LLLOGIN SERVICE]: attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName);
             gatekeeper = new GridRegion();
             gatekeeper.ExternalHostName = domainName;
             gatekeeper.HttpPort = port;
@@ -658,11 +659,9 @@ namespace OpenSim.Services.LLLoginService
                     gatekeeper = new GridRegion(destination);
                     gatekeeper.ExternalHostName = hostName;
                     gatekeeper.HttpPort = (uint)port;
-
-                }
-                else // login to foreign grid
-                {
+                    gatekeeper.ServerURI = m_GatekeeperURL;
                 }
+                m_log.Debug("[LLLOGIN SERVICE]: no gatekeeper detected..... using " + m_GatekeeperURL);
             }
 
             bool success = false;