diff options
| author | UbitUmarov | 2017-05-14 07:52:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-14 07:52:50 +0100 |
| commit | eea247fcc5f29c767dc1e3b7f9a5616843256e8d (patch) | |
| tree | ec27d1c12890efa30a2a04edb32c4190e265ba54 /OpenSim/Region/Application | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | clear land object on delete (diff) | |
| download | opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.zip opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.gz opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.bz2 opensim-SC-eea247fcc5f29c767dc1e3b7f9a5616843256e8d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 5cb6a88..bc6d7b3 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -74,7 +74,12 @@ namespace OpenSim | |||
| 74 | AppDomain.CurrentDomain.UnhandledException += | 74 | AppDomain.CurrentDomain.UnhandledException += |
| 75 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 75 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
| 76 | 76 | ||
| 77 | ServicePointManager.DefaultConnectionLimit = 12; | 77 | if(Util.IsWindows()) |
| 78 | ServicePointManager.DefaultConnectionLimit = 32; | ||
| 79 | else | ||
| 80 | ServicePointManager.DefaultConnectionLimit = 12; | ||
| 81 | |||
| 82 | ServicePointManager.Expect100Continue = false; | ||
| 78 | ServicePointManager.UseNagleAlgorithm = false; | 83 | ServicePointManager.UseNagleAlgorithm = false; |
| 79 | 84 | ||
| 80 | // Add the arguments supplied when running the application to the configuration | 85 | // Add the arguments supplied when running the application to the configuration |