OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not include hyperlinks in a random region search during a login. 

Before a random region is chosen, available fallback regions are used for the login.
viewer-2-initial-appearance
Marck 2010-11-02 20:00:14 +01:00 committed by Justin Clark-Casey (justincc)
parent 2368aab534
commit 98f29a47c0
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -28,6 +28,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@ -427,12 +428,9 @@ namespace OpenSim.Services.LLLoginService
{ {
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", 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); account.FirstName, account.LastName);
defaults = m_GridService.GetRegionsByName(scopeID, "", 1); region = FindAlternativeRegion(scopeID);
if (defaults != null && defaults.Count > 0) if (region != null)
{
region = defaults[0];
where = "safe"; where = "safe";
}
} }
} }
@ -459,12 +457,9 @@ namespace OpenSim.Services.LLLoginService
else else
{ {
m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region"); m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region");
defaults = m_GridService.GetRegionsByName(scopeID, "", 1); region = FindAlternativeRegion(scopeID);
if (defaults != null && defaults.Count > 0) if (region != null)
{
region = defaults[0];
where = "safe"; where = "safe";
}
} }
} }
@ -564,6 +559,31 @@ namespace OpenSim.Services.LLLoginService
} }
private GridRegion FindAlternativeRegion(UUID scopeID)
{
List<GridRegion> hyperlinks = null;
List<GridRegion> regions = m_GridService.GetFallbackRegions(scopeID, 1000 * (int)Constants.RegionSize, 1000 * (int)Constants.RegionSize);
if (regions != null && regions.Count > 0)
{
hyperlinks = m_GridService.GetHyperlinks(scopeID);
IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
if (availableRegions.Count() > 0)
return availableRegions.ElementAt(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);
if (regions != null && regions.Count > 0)
{
if (hyperlinks == null)
hyperlinks = m_GridService.GetHyperlinks(scopeID);
IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
if (availableRegions.Count() > 0)
return availableRegions.ElementAt(0);
}
return null;
}
private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper)
{ {
gatekeeper = new GridRegion(); gatekeeper = new GridRegion();

1
prebuild.xml
View File

@ -1214,6 +1214,7 @@
<ReferencePath>../../../bin/</ReferencePath> <ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Core"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Capabilities"/> <Reference name="OpenSim.Framework.Capabilities"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>