aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorAdam Frisby2009-05-23 07:51:29 +0000
committerAdam Frisby2009-05-23 07:51:29 +0000
commit70f6a2852eaea68bad0d26e5a5c1c7d8df3d8942 (patch)
treea430cb3dedf702f1294bdb8a9b14984ea6d15eb8 /OpenSim/Framework/Util.cs
parent* Disables internal IPv6 Support - causing issues. (diff)
downloadopensim-SC-70f6a2852eaea68bad0d26e5a5c1c7d8df3d8942.zip
opensim-SC-70f6a2852eaea68bad0d26e5a5c1c7d8df3d8942.tar.gz
opensim-SC-70f6a2852eaea68bad0d26e5a5c1c7d8df3d8942.tar.bz2
opensim-SC-70f6a2852eaea68bad0d26e5a5c1c7d8df3d8942.tar.xz
* Fixes [irritating] edge case in Util.GetLocalHost which could return an IPv6 address if no non-loopback IPv4 address can be found.
* Restores internal IPv6 support to NetworkUtil.* * Fixes bad login unit tests.
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r--OpenSim/Framework/Util.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 0128735..ee47e0f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -546,7 +546,15 @@ namespace OpenSim.Framework
546 } 546 }
547 547
548 if (hosts.Length > 0) 548 if (hosts.Length > 0)
549 {
550 foreach (IPAddress host in hosts)
551 {
552 if(host.AddressFamily == AddressFamily.InterNetwork)
553 return host;
554 }
555 // Well all else failed...
549 return hosts[0]; 556 return hosts[0];
557 }
550 558
551 return null; 559 return null;
552 } 560 }