From 2db27917712fa6522a22c19b2f13fbf65c3dbb01 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 7 Dec 2021 01:05:51 +0000 Subject: [PATCH] at login, if target region is not found and there are no default of fallback regions, try to send user to a region online. This is similar to what we had before 0.9.2.0, that demands the definition of default region(s) --- .../Services/LLLoginService/LLLoginService.cs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 1680d4a917..6d335bcda8 100755 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs @@ -800,24 +800,14 @@ namespace OpenSim.Services.LLLoginService private GridRegion FindAlternativeRegion(UUID scopeID) { - List hyperlinks = null; List regions = m_GridService.GetFallbackRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000)); if (regions != null && regions.Count > 0) - { return regions[0]; - } - // No fallbacks, try to find an arbitrary region that is not a hyperlink - // maxNumber is fixed for now; maybe use some search pattern with increasing maxSize here? - regions = m_GridService.GetRegionsByName(scopeID, "", 10); + regions = m_GridService.GetOnlineRegions(scopeID, (int)Util.RegionToWorldLoc(1000), (int)Util.RegionToWorldLoc(1000), 10); if (regions != null && regions.Count > 0) - { - if (hyperlinks == null) - hyperlinks = m_GridService.GetHyperlinks(scopeID); - IEnumerable availableRegions = regions.Except(hyperlinks); - if (availableRegions.Count() > 0) - return availableRegions.ElementAt(0); - } + return regions[0]; + return null; }