From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 21 Apr 2008 07:09:17 +0000
Subject: * Optimised using statements and namespace references across entire
 project (this took a while to run).

---
 OpenSim/Grid/ScriptServer/Application.cs                       |  3 ++-
 OpenSim/Grid/ScriptServer/FakeScene.cs                         |  3 ---
 OpenSim/Grid/ScriptServer/RemotingObject.cs                    |  3 ---
 OpenSim/Grid/ScriptServer/RemotingServer.cs                    |  4 ----
 .../ScriptServer/Region/RegionConnectionManager.cs             |  2 --
 OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs    |  4 ++--
 OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs   |  4 ++--
 OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs |  1 -
 OpenSim/Grid/ScriptServer/ScriptServerMain.cs                  | 10 +++++-----
 9 files changed, 11 insertions(+), 23 deletions(-)

(limited to 'OpenSim/Grid/ScriptServer')

diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 5cf781f..ef93f65 100644
--- a/OpenSim/Grid/ScriptServer/Application.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using log4net.Config;
 
 namespace OpenSim.Grid.ScriptServer
 {
@@ -35,7 +36,7 @@ namespace OpenSim.Grid.ScriptServer
 
         private static void Main(string[] args)
         {
-            log4net.Config.XmlConfigurator.Configure();
+            XmlConfigurator.Configure();
 
             AppDomain.CurrentDomain.UnhandledException +=
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs
index bb2ff4e..480050d 100644
--- a/OpenSim/Grid/ScriptServer/FakeScene.cs
+++ b/OpenSim/Grid/ScriptServer/FakeScene.cs
@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 8cdebe7..9d3065b 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -26,9 +26,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.ScriptEngine.Common;
 
 namespace OpenSim.Grid.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/RemotingServer.cs b/OpenSim/Grid/ScriptServer/RemotingServer.cs
index 6d8cc19..7d0e334 100644
--- a/OpenSim/Grid/ScriptServer/RemotingServer.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingServer.cs
@@ -25,13 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
-using OpenSim.Region.ScriptEngine.Common;
 
 namespace OpenSim.Grid.ScriptServer
 {
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index a3d014d..a9679f8 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Console;
-
 namespace OpenSim.Grid.ScriptServer
 {
     // Maintains connection and communication to a region
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
index 6cfd6bf..c87352c 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
@@ -27,7 +27,7 @@
 
 using System.Collections.Generic;
 using System.Threading;
-using OpenSim.Framework.Console;
+using OpenSim.Framework;
 
 namespace OpenSim.Grid.ScriptServer
 {
@@ -61,7 +61,7 @@ namespace OpenSim.Grid.ScriptServer
             listenThread.Name = "ListenThread";
             listenThread.IsBackground = true;
             listenThread.Start();
-            OpenSim.Framework.ThreadTracker.Add(listenThread);
+            ThreadTracker.Add(listenThread);
         }
 
         /// <summary>
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
index 6fcf5c8..4d8c559 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
@@ -28,14 +28,14 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Region.ScriptEngine.Common;
 
 namespace OpenSim.Grid.ScriptServer.ScriptServer
 {
     internal class ScriptEngineLoader
     {
-        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);
 
         public ScriptServerInterfaces.ScriptEngine LoadScriptEngine(string EngineName)
         {
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
index 2cb46dd..9d67602 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
@@ -26,7 +26,6 @@
  */
 
 using System.Collections.Generic;
-using OpenSim.Framework.Console;
 using OpenSim.Region.ScriptEngine.Common;
 
 namespace OpenSim.Grid.ScriptServer.ScriptServer
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 12e5f1d..729d262 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
+using System;
+using System.Reflection;
 using libsecondlife;
-using Nini.Config;
-using OpenSim.Framework;
+using log4net;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Grid.ScriptServer.ScriptServer;
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.ScriptServer
 {
     public class ScriptServerMain : BaseOpenSimServer, 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);
 
         //
         // Root object. Creates objects used.
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.ScriptServer
                     RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand);
             m_TCPServer.StartListen();
 
-            System.Console.ReadLine();
+            Console.ReadLine();
         }
 
         private void RPC_ReceiveCommand(int ID, string Command, object[] p)
-- 
cgit v1.1