diff options
author | Melanie | 2010-03-15 17:23:35 +0000 |
---|---|---|
committer | Melanie | 2010-03-15 17:23:35 +0000 |
commit | d3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch) | |
tree | 07795e74a637ca63d96b5ee06950b8c1a7a99489 /OpenSim/Services/GridService/HypergridLinker.cs | |
parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
parent | flip UVs for profile faces (diff) | |
download | opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2 opensim-SC-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index de5df9d..58746d0 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -168,10 +168,11 @@ namespace OpenSim.Services.GridService | |||
168 | } | 168 | } |
169 | 169 | ||
170 | // Sanity check. | 170 | // Sanity check. |
171 | IPAddress ipaddr = null; | 171 | //IPAddress ipaddr = null; |
172 | try | 172 | try |
173 | { | 173 | { |
174 | ipaddr = Util.GetHostFromDNS(host); | 174 | //ipaddr = Util.GetHostFromDNS(host); |
175 | Util.GetHostFromDNS(host); | ||
175 | } | 176 | } |
176 | catch | 177 | catch |
177 | { | 178 | { |