diff options
| author | Melanie | 2012-09-16 04:21:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:21:18 +0100 |
| commit | 66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba (patch) | |
| tree | f5ce10e917fa3ab24ed98cc10ca5a87057da71a9 /OpenSim/Region/Application | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revamp the HTTP textures handler to allow a maximum of four fetches (diff) | |
| download | opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.zip opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.gz opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.bz2 opensim-SC_OLD-66bf1376b5f9a0c9b5a3bdb58ac7eca09b6389ba.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 78636c4..0f90d37 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -74,7 +74,7 @@ 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 = 6; | 77 | ServicePointManager.DefaultConnectionLimit = 12; |
| 78 | 78 | ||
| 79 | // Add the arguments supplied when running the application to the configuration | 79 | // Add the arguments supplied when running the application to the configuration |
| 80 | ArgvConfigSource configSource = new ArgvConfigSource(args); | 80 | ArgvConfigSource configSource = new ArgvConfigSource(args); |