30 files changed, 71 insertions, 88 deletions

diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index 133ba0d..caf96ff 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Framework.Communications
@@ -47,7 +48,7 @@ namespace OpenSim.Framework.Communications
         public string CapsRequest(string request, string path, string param)
         {
             System.Console.WriteLine("new caps request " + request + " from path " + path);
-            return System.String.Empty;
+            return String.Empty;
         }
     }
 }
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.)
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 2eff9c2..c07744c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -29,12 +29,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-
+using System.Reflection;
 using libsecondlife;
-
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Region.Capabilities
@@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities
 
     public class Caps
     {
-        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 m_httpListenerHostName;
         private uint m_httpListenPort;
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 6992bd1..3e3ae16 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -25,14 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 876b8d3..1393523 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
 using System;
+using libsecondlife;
 
 namespace OpenSim.Region.Capabilities
 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index fb64c75..e71a73e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using libsecondlife;
 
 namespace OpenSim.Region.Capabilities
@@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities
     [LLSDMap]
     public class LLSDAssetUploadRequest
     {
-        public string asset_type = System.String.Empty;
-        public string description = System.String.Empty;
+        public string asset_type = String.Empty;
+        public string description = String.Empty;
         public LLUUID folder_id = LLUUID.Zero;
-        public string inventory_type = System.String.Empty;
-        public string name = System.String.Empty;
+        public string inventory_type = String.Empty;
+        public string name = String.Empty;
 
         public LLSDAssetUploadRequest()
         {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index fb721f0..bb293ba 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -25,13 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+
 namespace OpenSim.Region.Capabilities
 {
     [LLSDMap]
     public class LLSDAssetUploadResponse
     {
-        public string uploader = System.String.Empty;
-        public string state = System.String.Empty;
+        public string uploader = String.Empty;
+        public string state = String.Empty;
 
         public LLSDAssetUploadResponse()
         {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 36a2cbf..d402579 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.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 libsecondlife;
 
 namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 4fb0544..4439346 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -27,7 +27,6 @@
 */
 
 using System.Collections;
-using libsecondlife;
 
 namespace OpenSim.Region.Capabilities
 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 8a18213..941e70e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -26,8 +26,6 @@
 * 
 */
 
-using libsecondlife;
-
 namespace OpenSim.Region.Capabilities
 {
     [LLSDMap]
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 192c8e3..ee0d164 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -27,7 +27,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
@@ -36,7 +38,7 @@ namespace OpenSim.Framework.Communications
 {
     public class CommunicationsManager
     {
-        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 IUserService m_userService;
 
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 5e7f855..90bda01 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -26,9 +26,7 @@
  */
 
 using System.Collections.Generic;
-
 using libsecondlife;
-
 using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index d4e7539..f614e7d 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -29,14 +29,14 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Communications
 {
     public abstract class InventoryServiceBase : IInventoryServices
     {
-        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 Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
 
diff --git a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
index ded9ffc..6ec21d9 100644
--- a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
 namespace OpenSim.Framework.Communications.Limit
 {
     /// <summary>
diff --git a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
index 43b77a7..72d0586 100644
--- a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
 namespace OpenSim.Framework.Communications.Limit
 {    
     /// <summary>
diff --git a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
index 85ff2bd..dfa05fa 100644
--- a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 
 namespace OpenSim.Framework.Communications.Limit
diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
index b2b4f14..34b01ff 100644
--- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
+++ b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Communications.Limit
         {
             if (!IsMonitoringRequests(id))
             {
-                requests.Add(id, new Request(System.DateTime.Now));
+                requests.Add(id, new Request(DateTime.Now));
             }            
         }  
         
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 1b88d10..a379253 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -28,10 +28,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
 using libsecondlife.StructuredData;
+using log4net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.UserManagement
 {
@@ -41,7 +42,7 @@ namespace OpenSim.Framework.UserManagement
     /// </summary>
     public class LoginResponse
     {
-        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 Hashtable loginFlagsHash;
         private Hashtable globalTexturesHash;
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index ce8aa23..d656559 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -29,21 +29,22 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Web;
 using libsecondlife;
 using libsecondlife.StructuredData;
+using log4net;
 using Nwc.XmlRpc;
-
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Framework.UserManagement
 {
     public abstract class LoginService
     {
-        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_welcomeMessage = "Welcome to OpenSim";
         protected UserManagerBase m_userManager = null;
@@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement
                         {
                             webloginkey = new LLUUID((string)requestData["web_login_key"]);
                         }
-                        catch (System.Exception e)
+                        catch (Exception e)
                         {
                             m_log.InfoFormat(
                                  "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 
@@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement
                     statuscode = 301;
 
                     string redirectURL = "about:blank?redirect-http-hack=" +
-                        System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
+                        HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
                                                          lastname +
                                                          "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
                     //m_log.Info("[WEB]: R:" + redirectURL);
diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs
index 1178fed..5463134 100644
--- a/OpenSim/Framework/Communications/RestClient/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs
@@ -29,10 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Web;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Communications
 {
@@ -55,7 +56,7 @@ namespace OpenSim.Framework.Communications
     /// </remarks>
     public class RestClient
     {
-        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 realuri;
 
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index c86992a..0f7dc44 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -32,8 +32,8 @@ using System.Reflection;
 using System.Security.Cryptography;
 using libsecondlife;
 using libsecondlife.StructuredData;
+using log4net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
 
 namespace OpenSim.Framework.UserManagement
@@ -43,8 +43,8 @@ namespace OpenSim.Framework.UserManagement
     /// </summary>
     public abstract class UserManagerBase : IUserService
     {
-        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 UserConfig _config;
         private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
diff --git a/OpenSim/Framework/Communications/XMPP/Stanza.cs b/OpenSim/Framework/Communications/XMPP/Stanza.cs
index 5675a47..3930bac 100644
--- a/OpenSim/Framework/Communications/XMPP/Stanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/Stanza.cs
@@ -26,8 +26,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
index e41df26..26a78b2 100644
--- a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
+++ b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs
@@ -25,12 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using OpenSim.Framework;
-
 namespace OpenSim.Framework.Communications.XMPP
 {
     public class XMPPParser