aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2012-09-10 13:53:00 +0100
committerMelanie2012-09-10 13:53:00 +0100
commit21c476228a1dbeef1f180a16e9ebb47c8b3fa185 (patch)
tree5a2fc5d269eb4711fa2ace11d04731e7dc08607b /OpenSim/Region/Application
parentMerge branch 'master' into careminster (diff)
parentRemove commented code (diff)
downloadopensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.zip
opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.gz
opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.bz2
opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index ebfebc4..78636c4 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
30using System.Reflection; 31using System.Reflection;
31using log4net; 32using log4net;
32using log4net.Config; 33using log4net.Config;
@@ -73,6 +74,7 @@ namespace OpenSim
73 AppDomain.CurrentDomain.UnhandledException += 74 AppDomain.CurrentDomain.UnhandledException +=
74 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); 75 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
75 76
77 ServicePointManager.DefaultConnectionLimit = 6;
76 78
77 // Add the arguments supplied when running the application to the configuration 79 // Add the arguments supplied when running the application to the configuration
78 ArgvConfigSource configSource = new ArgvConfigSource(args); 80 ArgvConfigSource configSource = new ArgvConfigSource(args);