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

Merge branch 'master' of /home/opensim/src/opensim

bulletsim
BlueWall 2011-06-01 13:47:38 -04:00
parent 5711ada5c9 aed6e74080
commit 929bdba346
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,6 +516,7 @@ namespace OpenSim.Services.LLLoginService
// free uri form // free uri form
// e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34 // e.g. New Moon&135&46 New Moon@osgrid.org:8002&153&34
where = "url"; where = "url";
GridRegion region = null;
Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$"); Regex reURI = new Regex(@"^uri:(?<region>[^&]+)&(?<x>\d+)&(?<y>\d+)&(?<z>\d+)$");
Match uriMatch = reURI.Match(startLocation); Match uriMatch = reURI.Match(startLocation);
if (uriMatch == null) if (uriMatch == null)
@ -546,8 +547,18 @@ namespace OpenSim.Services.LLLoginService
} }
else else
{ {
m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, Grid does not provide default regions.", startLocation); m_log.Info("[LLOGIN SERVICE]: Last Region Not Found Attempting to find random region");
return null; region = FindAlternativeRegion(scopeID);
if (region != null)
{
where = "safe";
return region;
}
else
{
m_log.InfoFormat("[LLLOGIN SERVICE]: Got Custom Login URI {0}, Grid does not provide default regions and no alternative found.", startLocation);
return null;
}
} }
} }
return regions[0]; return regions[0];
@ -575,7 +586,8 @@ namespace OpenSim.Services.LLLoginService
if (parts.Length > 1) if (parts.Length > 1)
UInt32.TryParse(parts[1], out port); UInt32.TryParse(parts[1], out port);
GridRegion region = FindForeignRegion(domainName, port, regionName, out gatekeeper); // GridRegion region = FindForeignRegion(domainName, port, regionName, out gatekeeper);
region = FindForeignRegion(domainName, port, regionName, out gatekeeper);
return region; return region;
} }
} }