merge master

This commit is contained in:
UbitUmarov
2017-05-23 07:35:02 +01:00
23 changed files with 147 additions and 111 deletions

View File

@@ -81,6 +81,9 @@ namespace OpenSim.Server
ServicePointManager.UseNagleAlgorithm = false;
ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some mono decides to have it infinity
catch { }
m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
string registryLocation;