Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 29 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 797097f..5854428 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message);
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e);
                 return null;
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cb12d65..d547323 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3824,7 +3824,7 @@ namespace OpenSim.Region.Framework.Scenes
     
                     try
                     {
-                        if (!AuthorizeUser(acd, SeeIntoRegion, out reason))
+                        if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason))
                         {
                             m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                             return false;
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index e10c4cb..00502b1 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -72,11 +72,14 @@ namespace OpenSim.Services.HypergridService
         private static Uri m_Uri;
         private static GridRegion m_DefaultGatewayRegion;
 
+        private static Random m_Random;
+
         public GatekeeperService(IConfigSource config, ISimulationService simService)
         {
             if (!m_Initialized)
             {
                 m_Initialized = true;
+                m_Random = new Random();
 
                 IConfig serverConfig = config.Configs["GatekeeperService"];
                 if (serverConfig == null)
@@ -220,6 +223,8 @@ namespace OpenSim.Services.HypergridService
         public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason)
         {
             reason = string.Empty;
+            List<GridRegion> defaultRegions;
+            List<GridRegion> fallbackRegions;
 
             string authURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
@@ -374,8 +379,14 @@ namespace OpenSim.Services.HypergridService
             destination = m_GridService.GetRegionByUUID(m_ScopeID, destination.RegionID);
             if (destination == null)
             {
-                reason = "Destination region not found";
-                return false;
+                defaultRegions = m_GridService.GetDefaultRegions(UUID.Zero);
+                if (defaultRegions == null || (defaultRegions != null && defaultRegions.Count == 0))
+                {
+                    reason = "Destination region not found";
+                    return false;
+                }
+                int index = m_Random.Next(0, defaultRegions.Count - 1);
+                destination = defaultRegions[index];
             }
 
             m_log.DebugFormat(
@@ -415,7 +426,20 @@ namespace OpenSim.Services.HypergridService
 
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
 
-            return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
+            // try login to the desired region
+            if (m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason))
+                return true;
+
+            // if that failed, try the fallbacks
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Region {0} did not accept agent {1}", destination.RegionName, aCircuit.Name);
+            fallbackRegions = m_GridService.GetFallbackRegions(UUID.Zero, destination.RegionLocX, destination.RegionLocY);
+            foreach (GridRegion r in fallbackRegions)
+            {
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Trying region {0}...", r.RegionName);
+                if (m_SimulationService.CreateAgent(r, aCircuit, (uint)loginFlag, out reason))
+                    return true;
+            }
+            return false;
         }
 
         protected bool Authenticate(AgentCircuitData aCircuit)