diff options
| author | UbitUmarov | 2017-05-31 07:21:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-31 07:21:21 +0100 |
| commit | 55babdc16090397499081f0428500babe383ff3a (patch) | |
| tree | efb2f7ec13abba489d6318ebace8a86c6cde66c6 /OpenSim/Server/ServerMain.cs | |
| parent | disable llhttprequests secure con, since it still collides with main ssl sett... (diff) | |
| parent | we don't need to keep refs to baked textures assets (diff) | |
| download | opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 5c99ab7..4b7fd8a 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -82,8 +82,7 @@ namespace OpenSim.Server | |||
| 82 | ServicePointManager.UseNagleAlgorithm = false; | 82 | ServicePointManager.UseNagleAlgorithm = false; |
| 83 | ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate; | 83 | ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate; |
| 84 | 84 | ||
| 85 | try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case some mono decides to have it infinity | 85 | try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { } |
| 86 | catch { } | ||
| 87 | 86 | ||
| 88 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); | 87 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); |
| 89 | 88 | ||