2 files changed, 25 insertions, 0 deletions

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index ff0fcd5..77315bb 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -82,6 +82,9 @@ namespace OpenSim.Framework.Monitoring
         // IRegionModuleBase.Initialize
         public void Initialise(IConfigSource source)
         {
+            if (source == null)
+                return;
+
             IConfig cfg = source.Configs["Monitoring"];
 
             if (cfg != null)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 69dd950..b199931 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -38,6 +38,7 @@ using log4net.Repository;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
 using pCampBot.Interfaces;
 
 namespace pCampBot
@@ -143,6 +144,11 @@ namespace pCampBot
         private HashSet<string> m_defaultBehaviourSwitches = new HashSet<string>();
 
         /// <summary>
+        /// Collects general information on this server (which reveals this to be a misnamed class).
+        /// </summary>
+        private ServerStatsCollector m_serverStatsCollector;
+
+        /// <summary>
         /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data
         /// </summary>
         public BotManager()
@@ -151,6 +157,12 @@ namespace pCampBot
             // to multiple regions.
             Settings.MAX_HTTP_CONNECTIONS = int.MaxValue;
 
+//            System.Threading.ThreadPool.SetMaxThreads(600, 240);
+//
+//            int workerThreads, iocpThreads;
+//            System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
+//            Console.WriteLine("ThreadPool.GetMaxThreads {0} {1}", workerThreads, iocpThreads);
+
             InitBotSendAgentUpdates = true;
             InitBotRequestObjectTextures = true;
 
@@ -234,6 +246,14 @@ namespace pCampBot
                 "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
 
             m_bots = new List<Bot>();
+
+            Watchdog.Enabled = true;
+            StatsManager.RegisterConsoleCommands(m_console);
+
+            m_serverStatsCollector = new ServerStatsCollector();
+            m_serverStatsCollector.Initialise(null);
+            m_serverStatsCollector.Enabled = true;
+            m_serverStatsCollector.Start();
         }
 
         /// <summary>
@@ -697,6 +717,8 @@ namespace pCampBot
 
             MainConsole.Instance.Output("Shutting down");
 
+            m_serverStatsCollector.Close();
+
             Environment.Exit(0);
         }