* Assorted spring cleanings.

2 files changed, 11 insertions, 26 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cad0380..e89db3d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -26,21 +26,17 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Threading;
-using System.Timers;
 using libsecondlife;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.ClientStack;
@@ -50,7 +46,6 @@ using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
-using Timer=System.Timers.Timer;
 
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index 53e3583..ac5a1ec 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -26,33 +26,23 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Text;
+using System.Net;
+using System.Reflection;
 using System.Threading;
 using System.Timers;
+using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.ClientStack;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Environment;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Physics.Manager;
 using Timer=System.Timers.Timer;
-using System.Net;
-using Nwc.XmlRpc;
-using System.Collections;
-using System.Reflection;
-using libsecondlife;
-using Mono.Addins;
-using Mono.Addins.Description;
 
 namespace OpenSim
 {
@@ -60,7 +50,7 @@ namespace OpenSim
 
     public class OpenSimMainConsole : OpenSimMain, 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 string m_startupCommandsFile;
         protected string m_shutdownCommandsFile;
@@ -243,7 +233,7 @@ namespace OpenSim
                         }
                         else
                         {
-                            m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2]));
+                            m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2]));
                         }
                     }
                     else
@@ -300,7 +290,7 @@ namespace OpenSim
 //                         m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString());
 //                     }
 
-                    List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads();
+                    List<Thread> threads = ThreadTracker.GetThreads();
                     if (threads == null)
                     {
                         m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode.");
@@ -546,7 +536,7 @@ namespace OpenSim
                             case "unload":
                                 if (cmdparams.Length > 1)
                                 {
-                                    foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules))
+                                    foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules))
                                     {
                                         if (rm.Name.ToLower() == cmdparams[1].ToLower())
                                         {
@@ -559,7 +549,7 @@ namespace OpenSim
                             case "load":
                                 if (cmdparams.Length > 1)
                                 {
-                                    foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes))
+                                    foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
                                     {
                                         
                                         m_console.Notice("Loading module: " + cmdparams[1]);
@@ -632,7 +622,7 @@ namespace OpenSim
                     {
                         RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
                         string regionName;
-                        System.Net.EndPoint ep = null;
+                        EndPoint ep = null;
 
                         if (regionInfo == null)
                         {