diff options
author | Diva Canto | 2010-01-30 16:09:40 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-30 16:09:40 -0800 |
commit | 1ab8458b1c8b3d687c66f4cb69b05e6fa938784c (patch) | |
tree | 2e8e5f86212c718fd53bf215bc4f70fe471681cd /OpenSim/Services/GridService | |
parent | Bug fix: change HGBroker to a INonSharedRegionModule (diff) | |
download | opensim-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/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 8 |
1 files changed, 6 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); |