* Optimised using statements and namespace references across entire project (this took a while to run).

8 files changed, 33 insertions, 31 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 4d37e74..c81ea35 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -27,11 +27,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
-
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Framework.Communications.Cache
@@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache
     /// </summary>
     public class AssetCache : IAssetReceiver
     {
-        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);
 
         /// <summary>
         /// The cache of assets.  This does not include textures.
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache
               m_assetCacheThread.Name = "AssetCacheThread";
               m_assetCacheThread.IsBackground = true;
               m_assetCacheThread.Start();
-             OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread);
+             ThreadTracker.Add(m_assetCacheThread);
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index 3ce28c2..891fa6d 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -25,16 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 using System.IO;
+using System.Reflection;
 using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Communications.Cache
 {
     public class LocalAssetServer : AssetServerBase
     {
-        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);
 
         private IObjectContainer db;
 
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 261b697..1a7f872 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -26,18 +26,18 @@
  */
 
 using System;
-using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Framework.AssetLoader.Filesystem;
 
 namespace OpenSim.Framework.Communications.Cache
 {
     public abstract class AssetServerBase : IAssetServer
     {
-        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 IAssetReceiver m_receiver;
         protected BlockingQueue<AssetRequest> m_assetRequests;
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache
             m_localAssetServerThread.Name = "LocalAssetServerThread";
             m_localAssetServerThread.IsBackground = true;
             m_localAssetServerThread.Start();
-            OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread);
+            ThreadTracker.Add(m_localAssetServerThread);
         }
 
         private void RunRequests()
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index ec5717e..a245af1 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -27,8 +27,9 @@
 
 using System;
 using System.Collections.Generic;
-
+using System.Reflection;
 using libsecondlife;
+using log4net;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
     /// </summary>
     public class CachedUserInfo
     {
-        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);
         
         /// <summary>
         /// The comms manager holds references to services (user, grid, inventory, etc.)
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 3e703d2..d5b7fea 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -27,15 +27,16 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using System.Xml.Serialization;
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Framework.Communications.Cache
 {
     public class GridAssetClient : AssetServerBase
     {
-        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);
 
         private string _assetServerUrl;
 
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 03036d0..a39738d 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -28,10 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Xml;
 using libsecondlife;
+using log4net;
 using Nini.Config;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache
     /// </summary>
     public class LibraryRootFolder : InventoryFolderImpl
     {
-        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);
 
         private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
         
@@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache
         {
             string foldersPath 
                 = Path.Combine(
-                    Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty));
+                    Util.inventoryDir(), config.GetString("foldersFile", String.Empty));
             
             LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig);
             
             string itemsPath 
                 = Path.Combine(
-                    Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty));
+                    Util.inventoryDir(), config.GetString("itemsFile", String.Empty));
             
             LoadFromFile(itemsPath, "Library items", ReadItemFromConfig);
         }
@@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache
             item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString()));
             item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString()));
             item.Folder = new LLUUID(config.GetString("folderID", ID.ToString()));
-            item.Description = config.GetString("description", System.String.Empty);
-            item.Name = config.GetString("name", System.String.Empty);
+            item.Description = config.GetString("description", String.Empty);
+            item.Name = config.GetString("name", String.Empty);
             item.AssetType = config.GetInt("assetType", 0);
             item.InvType = config.GetInt("inventoryType", 0);
             item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 4f1a304..1afec70 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -27,13 +27,13 @@
 
 using System;
 using System.Reflection;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Communications.Cache
 {
     public class SQLAssetServer : AssetServerBase
     {
-        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 SQLAssetServer(string pluginName)
         {
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 9813756..bf8ff40 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -25,13 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
-
 using libsecondlife;
-
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Communications.Cache
 {
@@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache
     /// </summary>
     public class UserProfileCacheService
     {
-        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);
 
         /// <summary>
         /// The comms manager holds references to services (user, grid, inventory, etc.)