Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-09-10 13:53:00 +01:00
20 changed files with 401 additions and 243 deletions

View File

@@ -27,6 +27,7 @@
using System;
using System.IO;
using System.Net;
using System.Reflection;
using log4net;
using log4net.Config;
@@ -73,6 +74,7 @@ namespace OpenSim
AppDomain.CurrentDomain.UnhandledException +=
new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
ServicePointManager.DefaultConnectionLimit = 6;
// Add the arguments supplied when running the application to the configuration
ArgvConfigSource configSource = new ArgvConfigSource(args);