Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 52e7501..9e82577 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using log4net.Config;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -52,6 +53,8 @@ namespace pCampBot
         [STAThread]
         public static void Main(string[] args)
         {
+            XmlConfigurator.Configure();
+
             IConfig config = ParseConfig(args);
             if (config.Get("help") != null || config.Get("loginuri") == null)
             {