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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/GridService/HypergridLinker.cs
View File

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

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

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