Bug fix for making cross-grid login work.

slimupdates
Diva Canto 2010-01-30 16:09:40 -08:00
parent a0d79e621c
commit 1ab8458b1c
2 changed files with 7 additions and 2 deletions

View File

@ -165,13 +165,17 @@ namespace OpenSim.Services.GridService
regionName = parts[2];
}
// Sanity check. Don't ever link to this sim.
// Sanity check.
IPAddress ipaddr = null;
try
{
ipaddr = Util.GetHostFromDNS(host);
}
catch { }
catch
{
reason = "Malformed hostname";
return null;
}
GridRegion regInfo;
bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, out regInfo, out reason);

View File

@ -405,6 +405,7 @@ namespace OpenSim.Services.LLLoginService
gatekeeper.ExternalHostName = domainName;
gatekeeper.HttpPort = port;
gatekeeper.RegionName = regionName;
gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
UUID regionID;
ulong handle;