4 files changed, 15 insertions, 22 deletions

diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 525f33c..0521df2 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.IO;
+using log4net.Config;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -58,7 +59,7 @@ namespace OpenSim.Tools.Export
 
         public static void Main(string[] args)
         {
-            log4net.Config.XmlConfigurator.Configure();
+            XmlConfigurator.Configure();
 
             OpenSimExport export = new OpenSimExport(InitConfig(args));
             RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false);
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index a18fa1b..df06f47 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -27,12 +27,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
+using System.Reflection;
+using System.Threading;
 using libsecondlife;
-using libsecondlife.Packets;
+using log4net;
 using Nini.Config;
-using System.Threading;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
@@ -43,13 +42,13 @@ namespace pCampBot
     /// </summary>
     public class BotManager : conscmd_callback
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected ConsoleBase m_console;
         protected List<PhysicsBot> m_lBot;
         protected Thread[] m_td;
         protected bool m_verbose = true;
-        protected Random somthing = new Random(System.Environment.TickCount);
+        protected Random somthing = new Random(Environment.TickCount);
         protected int numbots = 0;
         protected IConfig Previous_config;
         
@@ -117,7 +116,7 @@ namespace pCampBot
             m_td[pos].IsBackground = true;
             m_td[pos].Start();
             m_lBot.Add(pb);
-            OpenSim.Framework.ThreadTracker.Add(m_td[pos]);
+            ThreadTracker.Add(m_td[pos]);
         }
 
         /// <summary>
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 8495b09..334f699 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -26,16 +26,14 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
+using System.Threading;
+using System.Timers;
 using libsecondlife;
-using libsecondlife.Packets;
 using Nini.Config;
-using System.Threading;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using Timer = System.Timers.Timer;
+using Timer=System.Timers.Timer;
 
 namespace pCampBot
 {
@@ -54,7 +52,7 @@ namespace pCampBot
 
         protected Timer m_action; // Action Timer
 
-        protected Random somthing = new Random(System.Environment.TickCount);// We do stuff randomly here
+        protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
 
         //New instance of a SecondLife client
         public SecondLife client = new SecondLife();
@@ -74,7 +72,7 @@ namespace pCampBot
         //We do our actions here.  This is where one would 
         //add additional steps and/or things the bot should do
 
-        void m_action_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        void m_action_Elapsed(object sender, ElapsedEventArgs e)
         {
             //client.Throttle.Task = 500000f;
             //client.Throttle.Set();
@@ -145,7 +143,7 @@ namespace pCampBot
                 if (OnConnected != null)
                 {
                     m_action = new Timer(somthing.Next(1000, 10000));
-                    m_action.Elapsed += new System.Timers.ElapsedEventHandler(m_action_Elapsed);
+                    m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
                     m_action.Start();
                     OnConnected(this, EventType.CONNECTED);
                     client.Self.Jump();
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 6daccc4..d944608 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -26,12 +26,7 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using libsecondlife.Packets;
 using Nini.Config;
-using System.Threading;
 using OpenSim.Framework.Console;
 
 namespace pCampBot
@@ -86,7 +81,7 @@ namespace pCampBot
         
         private static void Help()
         {
-            System.Console.WriteLine(
+            Console.WriteLine(
                                      "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
                                      "Spawns a set of bots to test an OpenSim region\n\n" +
                                      "  -l, -loginuri      loginuri for sim to log into (required)\n" +