1 files changed, 22 insertions, 3 deletions

diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 1eaf4d4..7b25274 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -339,9 +339,16 @@ namespace OpenSim.Services.LLLoginService
                         where = "safe";
                     }
                     else
-                        m_log.WarnFormat(
-                            "[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations.",
+                    {
+                        m_log.WarnFormat("[LLOGIN SERVICE]: User {0} {1} does not have a valid home and this grid does not have default locations. Attempting to find random region",
                             account.FirstName, account.LastName);
+                        defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1);
+                        if (defaults != null && defaults.Count > 0)
+                        {
+                            region = defaults[0];
+                            where = "safe";
+                        }
+                    }
                 }
 
                 return region;
@@ -364,6 +371,17 @@ namespace OpenSim.Services.LLLoginService
                         region = defaults[0];
                         where = "safe";
                     }
+                    else
+                    {
+                        m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region");
+                        defaults = m_GridService.GetRegionsByName(account.ScopeID, "", 1);
+                        if (defaults != null && defaults.Count > 0)
+                        {
+                            region = defaults[0];
+                            where = "safe";
+                        }
+                    }
+
                 }
                 else
                 {
@@ -396,7 +414,6 @@ namespace OpenSim.Services.LLLoginService
                     {
                         if (!regionName.Contains("@"))
                         {
-
                             List<GridRegion> regions = m_GridService.GetRegionsByName(account.ScopeID, regionName, 1);
                             if ((regions == null) || (regions != null && regions.Count == 0))
                             {
@@ -429,6 +446,7 @@ namespace OpenSim.Services.LLLoginService
                                 return null;
                             }
                             // Valid specification of a remote grid
+                            
                             regionName = parts[0];
                             string domainLocator = parts[1];
                             parts = domainLocator.Split(new char[] {':'});
@@ -436,6 +454,7 @@ namespace OpenSim.Services.LLLoginService
                             uint port = 0;
                             if (parts.Length > 1)
                                 UInt32.TryParse(parts[1], out port);
+
                             GridRegion region = FindForeignRegion(domainName, port, regionName, out gatekeeper);
                             return region;
                         }