1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 09f6920..c180ca6 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -85,8 +85,6 @@ namespace OpenSim.Server
             ServicePointManager.UseNagleAlgorithm = false;
             ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
 
-            try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { }
-
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
 
             string registryLocation;
@@ -98,6 +96,9 @@ namespace OpenSim.Server
                 throw new Exception("Configuration error");
             }
 
+            int dnsTimeout = serverConfig.GetInt("DnsTimeout", 30000);
+            try { ServicePointManager.DnsRefreshTimeout = dnsTimeout; } catch { }
+
             m_NoVerifyCertChain = serverConfig.GetBoolean("NoVerifyCertChain", m_NoVerifyCertChain);
             m_NoVerifyCertHostname = serverConfig.GetBoolean("NoVerifyCertHostname", m_NoVerifyCertHostname);