diff options
| author | John Hurliman | 2010-03-15 15:38:55 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-15 15:38:55 -0700 |
| commit | 4e180e84e2f3a3bc428dd7f8f9eeea8252b34093 (patch) | |
| tree | 372b87740f5c974f9c90a258eb6b794ee105dc26 /OpenSim/Services/GridService/HypergridLinker.cs | |
| parent | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors (diff) | |
| parent | flip UVs for profile faces (diff) | |
| download | opensim-SC_OLD-4e180e84e2f3a3bc428dd7f8f9eeea8252b34093.zip opensim-SC_OLD-4e180e84e2f3a3bc428dd7f8f9eeea8252b34093.tar.gz opensim-SC_OLD-4e180e84e2f3a3bc428dd7f8f9eeea8252b34093.tar.bz2 opensim-SC_OLD-4e180e84e2f3a3bc428dd7f8f9eeea8252b34093.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 | { |