aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-01-30 16:09:40 -0800
committerDiva Canto2010-01-30 16:09:40 -0800
commit1ab8458b1c8b3d687c66f4cb69b05e6fa938784c (patch)
tree2e8e5f86212c718fd53bf215bc4f70fe471681cd /OpenSim
parentBug fix: change HGBroker to a INonSharedRegionModule (diff)
downloadopensim-SC_OLD-1ab8458b1c8b3d687c66f4cb69b05e6fa938784c.zip
opensim-SC_OLD-1ab8458b1c8b3d687c66f4cb69b05e6fa938784c.tar.gz
opensim-SC_OLD-1ab8458b1c8b3d687c66f4cb69b05e6fa938784c.tar.bz2
opensim-SC_OLD-1ab8458b1c8b3d687c66f4cb69b05e6fa938784c.tar.xz
Bug fix for making cross-grid login work.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs8
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs1
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index cda7dae..c0b635c 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -165,13 +165,17 @@ namespace OpenSim.Services.GridService
165 regionName = parts[2]; 165 regionName = parts[2];
166 } 166 }
167 167
168 // Sanity check. Don't ever link to this sim. 168 // Sanity check.
169 IPAddress ipaddr = null; 169 IPAddress ipaddr = null;
170 try 170 try
171 { 171 {
172 ipaddr = Util.GetHostFromDNS(host); 172 ipaddr = Util.GetHostFromDNS(host);
173 } 173 }
174 catch { } 174 catch
175 {
176 reason = "Malformed hostname";
177 return null;
178 }
175 179
176 GridRegion regInfo; 180 GridRegion regInfo;
177 bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, out regInfo, out reason); 181 bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, out regInfo, out reason);
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index cacedf8..1c5245d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -405,6 +405,7 @@ namespace OpenSim.Services.LLLoginService
405 gatekeeper.ExternalHostName = domainName; 405 gatekeeper.ExternalHostName = domainName;
406 gatekeeper.HttpPort = port; 406 gatekeeper.HttpPort = port;
407 gatekeeper.RegionName = regionName; 407 gatekeeper.RegionName = regionName;
408 gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
408 409
409 UUID regionID; 410 UUID regionID;
410 ulong handle; 411 ulong handle;