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

OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs

@@ -25,9 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Reflection;
+using System.Threading;
+using log4net;
 using Mono.Addins;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.RegionLoader.Filesystem;
 using OpenSim.Framework.RegionLoader.Web;
 
@@ -39,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
     [Extension("/OpenSim/Startup")]
     public class LoadRegionsPlugin : IApplicationPlugin
     {
-        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 void Initialise(OpenSimMain openSim)
         {
@@ -64,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
 
             for (int i = 0; i < regionsToLoad.Length; i++)
             {
-                m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
+                m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
                 openSim.CreateRegion(regionsToLoad[i], true); 
             }
 
@@ -94,7 +96,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             {
                 if (regionhandle == regionsToLoad[i].RegionHandle)
                 {
-                    m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
+                    m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
                     openSim.CreateRegion(regionsToLoad[i], true);
                 }
             }

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -27,14 +27,15 @@
 
 using System;
 using System.Collections;
-using System.Net;
 using System.IO;
+using System.Net;
+using System.Reflection;
 using System.Timers;
 using libsecondlife;
+using log4net;
 using Mono.Addins;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Scenes;
 
@@ -46,7 +47,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
     [Extension("/OpenSim/Startup")]
     public class RemoteAdminPlugin : IApplicationPlugin
     {
-        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 OpenSimMain m_app;
         private BaseHttpServer m_httpd;

OpenSim/Data/AssetDataBase.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;
 using OpenSim.Framework;
 

OpenSim/Data/Base/BaseRowMapper.cs

@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Data.Base;
-
 namespace OpenSim.Data.Base
 {
     public abstract class BaseRowMapper

OpenSim/Data/Base/BaseSchema.cs

@@ -26,7 +26,6 @@
  */
 
 using System.Collections.Generic;
-using OpenSim.Data.Base;
 
 namespace OpenSim.Data.Base
 {

OpenSim/Data/Base/BaseTableMapper.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using OpenSim.Data.Base;
 
 namespace OpenSim.Data.Base
 {

OpenSim/Data/DB4o/DB4oUserData.cs

@@ -174,10 +174,10 @@ namespace OpenSim.Data.DB4o
 
         
 
-        public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
             //Do nothing yet
-            List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
+            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             return returnlist;
         }
 

OpenSim/Data/DataStoreBase.cs

@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Data
 {
     public abstract class DataStoreBase

OpenSim/Data/GridDataBase.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.Data

OpenSim/Data/IGridData.cs

@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Data

OpenSim/Data/InventoryDataBase.cs

@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Data
 {
     public abstract class InventoryDataBase

OpenSim/Data/MSSQL/MSSQLAssetData.cs

@@ -29,15 +29,16 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
 {
     internal class MSSQLAssetData : AssetDataBase
     {
-        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 MSSQLManager database;
 

OpenSim/Data/MSSQL/MSSQLDataStore.cs

@@ -30,20 +30,19 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Data;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Data.MSSQL;
 
 namespace OpenSim.Data.MSSQL
 {
     public class MSSQLDataStore : IRegionDataStore
     {
         // private static FileSystemDataStore Instance = new FileSystemDataStore();
-        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 const string m_primSelect = "select * from prims";
         private const string m_shapeSelect = "select * from primshapes";

OpenSim/Data/MSSQL/MSSQLGridData.cs

@@ -28,10 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Data.MSSQL
 {
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLGridData : GridDataBase
     {
-        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>
         /// Database manager

OpenSim/Data/MSSQL/MSSQLInventoryData.cs

@@ -29,9 +29,10 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
 {
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLInventoryData : IInventoryData
     {
-        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 database manager

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -32,8 +32,8 @@ using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
 {
@@ -42,7 +42,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLManager
     {
-        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 database connection object

OpenSim/Data/MSSQL/MSSQLUserData.cs

@@ -29,9 +29,10 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MSSQL
 {
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLUserData : UserDataBase
     {
-        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>
         /// Database manager for MySQL
@@ -326,9 +327,9 @@ namespace OpenSim.Data.MSSQL
 
 
 
-        override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
-            List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
+            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             string[] querysplit;
             querysplit = query.Split(' ');
             if (querysplit.Length == 2)
@@ -350,7 +351,7 @@ namespace OpenSim.Data.MSSQL
 
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string)reader["UUID"]);
                             user.firstName = (string)reader["username"];
                             user.lastName = (string)reader["lastname"];
@@ -385,7 +386,7 @@ namespace OpenSim.Data.MSSQL
 
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string)reader["UUID"]);
                             user.firstName = (string)reader["username"];
                             user.lastName = (string)reader["lastname"];

OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs

@@ -28,7 +28,6 @@
 using System;
 using System.Data.Common;
 using System.Data.SqlClient;
-using OpenSim.Data;
 
 namespace OpenSim.Data.MSSQLMapper
 {

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -28,16 +28,17 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
 {
     internal class MySQLAssetData : AssetDataBase, IPlugin
     {
-        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 MySQLManager _dbConnection;
 

OpenSim/Data/MySQL/MySQLDataStore.cs

@@ -28,12 +28,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Diagnostics;
 using System.IO;
+using System.Reflection;
+using System.Threading;
 using libsecondlife;
+using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
@@ -41,7 +42,7 @@ namespace OpenSim.Data.MySQL
 {
     public class MySQLDataStore : IRegionDataStore
     {
-        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 const string m_primSelect = "select * from prims";
         private const string m_shapeSelect = "select * from primshapes";
@@ -1498,7 +1499,7 @@ namespace OpenSim.Data.MySQL
                 {
                     m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message);
                     m_log.Error("[MySql]: Application is terminating!");
-                    System.Threading.Thread.CurrentThread.Abort();
+                    Thread.CurrentThread.Abort();
                 }
             }
 

OpenSim/Data/MySQL/MySQLGridData.cs

@@ -28,11 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.RegularExpressions;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Data.MySQL
 {
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     public class MySQLGridData : GridDataBase
     {
-        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>
         /// MySQL Database Manager

OpenSim/Data/MySQL/MySQLInventoryData.cs

@@ -27,10 +27,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
 {
@@ -39,8 +40,8 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     public class MySQLInventoryData : IInventoryData
     {
-        private static readonly log4net.ILog m_log 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// The database manager

OpenSim/Data/MySQL/MySQLManager.cs

@@ -28,13 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
 using libsecondlife;
+using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
 {
@@ -43,7 +42,7 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     internal class MySQLManager
     {
-        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 database connection object

OpenSim/Data/MySQL/MySQLUserData.cs

@@ -28,10 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.MySQL
 {
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     internal class MySQLUserData : UserDataBase
     {
-        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>
         /// Database manager for MySQL
@@ -348,9 +349,9 @@ namespace OpenSim.Data.MySQL
             m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
         }
 
-        override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
-            List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
+            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
 
             Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
 
@@ -373,7 +374,7 @@ namespace OpenSim.Data.MySQL
 
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["lastname"];
@@ -407,7 +408,7 @@ namespace OpenSim.Data.MySQL
 
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["lastname"];

OpenSim/Data/MySQLMapper/MySQLDataReader.cs

@@ -25,11 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Text;
-using OpenSim.Data.Base;
 
 namespace OpenSim.Data.MySQLMapper
 {

OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs

@@ -28,7 +28,6 @@
 using System.Data;
 using System.Data.Common;
 using MySql.Data.MySqlClient;
-using OpenSim.Data;
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data.MySQLMapper

OpenSim/Data/NHibernate/NHibernateAssetData.cs

@@ -26,16 +26,14 @@
  */
 
 using System;
-using System.Data;
+using System.IO;
 using System.Reflection;
 using libsecondlife;
+using log4net;
 using NHibernate;
 using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
 using NHibernate.Mapping.Attributes;
-using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
@@ -45,7 +43,7 @@ namespace OpenSim.Data.NHibernate
     /// </summary>
     public class NHibernateAssetData : AssetDataBase, IDisposable
     {
-        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 Configuration cfg;
         private ISessionFactory factory;
@@ -67,8 +65,8 @@ namespace OpenSim.Data.NHibernate
             cfg.AddAssembly("OpenSim.Data.NHibernate");
 
             HbmSerializer.Default.Validate = true;
-            using ( System.IO.MemoryStream stream = 
+            using ( MemoryStream stream = 
-                    HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
+                    HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
                 cfg.AddInputStream(stream);
             
             // new SchemaExport(cfg).Create(true, true);

OpenSim/Data/NHibernate/NHibernateInventoryData.cs

@@ -26,25 +26,23 @@
  */
 
 using System;
-using System.Data;
-using System.Reflection;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using NHibernate;
-using NHibernate.Expression;
 using NHibernate.Cfg;
-using NHibernate.Tool.hbm2ddl;
+using NHibernate.Expression;
 using NHibernate.Mapping.Attributes;
-using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using Environment=NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
     public class NHibernateInventoryData: IInventoryData
     {
-        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 Configuration cfg;
         private ISessionFactory factory;
@@ -74,8 +72,8 @@ namespace OpenSim.Data.NHibernate
             cfg.AddAssembly("OpenSim.Data.NHibernate");
 
             HbmSerializer.Default.Validate = true;
-            using ( System.IO.MemoryStream stream = 
+            using ( MemoryStream stream = 
-                    HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
+                    HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
                 cfg.AddInputStream(stream);
             
             // new SchemaExport(cfg).Create(true, true);

OpenSim/Data/NHibernate/NHibernateManager.cs

@@ -25,18 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
+using System.Reflection;
-using System.Collections.Generic;
+using log4net;
-using System.Data;
-using libsecondlife;
 using NHibernate;
-using NHibernate.Cfg;
 
 namespace OpenSim.Data.NHibernate
 {
     internal class NHibernateManager
     {
-        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 ISessionFactory factory;
         private ISession session;

OpenSim/Data/NHibernate/NHibernateUserData.cs

@@ -25,20 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Data;
-using System.Reflection;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Expression;
-using NHibernate.Tool.hbm2ddl;
 using NHibernate.Mapping.Attributes;
-using OpenSim.Data;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using Environment = NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
@@ -47,7 +43,7 @@ namespace OpenSim.Data.NHibernate
     /// </summary>
     public class NHibernateUserData : UserDataBase
     {
-        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 Configuration cfg;
         private ISessionFactory factory;
@@ -69,8 +65,8 @@ namespace OpenSim.Data.NHibernate
             cfg.AddAssembly("OpenSim.Data.NHibernate");
 
             HbmSerializer.Default.Validate = true;
-            using ( System.IO.MemoryStream stream = 
+            using ( MemoryStream stream = 
-                    HbmSerializer.Default.Serialize(System.Reflection.Assembly.GetExecutingAssembly()))
+                    HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly()))
                 cfg.AddInputStream(stream);
             
             // new SchemaExport(cfg).Create(true, true);

OpenSim/Data/NHibernate/Types/LLUUIDUserType.cs

@@ -27,10 +27,10 @@
 
 using System;
 using System.Data;
+using libsecondlife;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
-using libsecondlife;
 
 namespace OpenSim.Data.NHibernate
 {
@@ -67,7 +67,7 @@ namespace OpenSim.Data.NHibernate
             get { return false; }
         }
 
-        public object NullSafeGet(System.Data.IDataReader rs, string[] names, object owner)
+        public object NullSafeGet(IDataReader rs, string[] names, object owner)
         {
             object uuid = null; 
 
@@ -81,7 +81,7 @@ namespace OpenSim.Data.NHibernate
             return uuid;
         }
 
-        public void NullSafeSet(System.Data.IDbCommand cmd, object obj, int index)
+        public void NullSafeSet(IDbCommand cmd, object obj, int index)
         {
             LLUUID uuid = (LLUUID)obj;
             ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();

OpenSim/Data/OpenSimDataReader.cs

@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Data;
 using libsecondlife;
 using OpenSim.Data.Base;

OpenSim/Data/OpenSimDatabaseConnector.cs

@@ -26,9 +26,7 @@
  */
 
 using System.Data;
-using System.Data.Common;
 using libsecondlife;
-
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data

OpenSim/Data/OpenSimObjectFieldMapper.cs

@@ -28,9 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using System.Text;
 using libsecondlife;
-
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data

OpenSim/Data/OpenSimTableMapper.cs

@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Data;
-
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data

OpenSim/Data/PrimitiveBaseShapeTableMapper.cs

@@ -26,9 +26,9 @@
  */
 
 using System;
-using OpenSim.Framework;
-using OpenSim.Data.Base;
 using libsecondlife;
+using OpenSim.Data.Base;
+using OpenSim.Framework;
 
 namespace OpenSim.Data
 {

OpenSim/Data/ReservationData.cs

@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using libsecondlife;
 
 namespace OpenSim.Data
@@ -37,11 +38,11 @@ namespace OpenSim.Data
         public int reservationMaxX = 65536;
         public int reservationMaxY = 65536;
 
-        public string reservationName = System.String.Empty;
+        public string reservationName = String.Empty;
-        public string reservationCompany = System.String.Empty;
+        public string reservationCompany = String.Empty;
         public bool status = true;
 
-        public string gridSendKey = System.String.Empty;
+        public string gridSendKey = String.Empty;
-        public string gridRecvKey = System.String.Empty;
+        public string gridRecvKey = String.Empty;
     }
 }

OpenSim/Data/SQLite/SQLiteAssetData.cs

@@ -29,9 +29,9 @@ using System;
 using System.Data;
 using System.Reflection;
 using libsecondlife;
+using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
 {
@@ -40,7 +40,7 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteAssetData : AssetDataBase
     {
-        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 database manager

OpenSim/Data/SQLite/SQLiteInventoryStore.cs

@@ -30,15 +30,15 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using libsecondlife;
+using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
 {
     public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
     {
-        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 const string invItemsSelect = "select * from inventoryitems";
         private const string invFoldersSelect = "select * from inventoryfolders";

OpenSim/Data/SQLite/SQLiteManager.cs

@@ -29,15 +29,15 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
+using System.Reflection;
 using libsecondlife;
-using Mono.Data.SqliteClient;
+using log4net;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
 {
     internal class SQLiteManager : SQLiteUtil
     {
-        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 IDbConnection dbcon;
 

OpenSim/Data/SQLite/SQLiteRegionData.cs

@@ -29,10 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
 {
     public class SQLiteRegionData : IRegionDataStore
     {
-        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 const string primSelect = "select * from prims";
         private const string shapeSelect = "select * from primshapes";

OpenSim/Data/SQLite/SQLiteUserData.cs

@@ -28,10 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Data.SQLite
 {
@@ -40,7 +41,7 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteUserData : UserDataBase
     {
-        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 database manager
@@ -238,9 +239,9 @@ namespace OpenSim.Data.SQLite
         }
 
 
-        override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
-            List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
+            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             string[] querysplit;
             querysplit = query.Split(' ');
             if (querysplit.Length == 2)
@@ -254,7 +255,7 @@ namespace OpenSim.Data.SQLite
                     {
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["surname"];
@@ -275,7 +276,7 @@ namespace OpenSim.Data.SQLite
                     {
                         while (reader.Read())
                         {
-                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
+                            AvatarPickerAvatar user = new AvatarPickerAvatar();
                             user.AvatarID = new LLUUID((string) reader["UUID"]);
                             user.firstName = (string) reader["username"];
                             user.lastName = (string) reader["surname"];
@@ -766,7 +767,7 @@ namespace OpenSim.Data.SQLite
 
                 pcmd.ExecuteNonQuery();
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 m_log.Info("[USERS]: users table already exists");
             }
@@ -775,7 +776,7 @@ namespace OpenSim.Data.SQLite
             {
                 fcmd.ExecuteNonQuery();
             }
-            catch (System.Exception)
+            catch (Exception)
             {
                 m_log.Info("[USERS]: userfriends table already exists");
             }

OpenSim/Data/UserDataBase.cs

@@ -52,6 +52,6 @@ namespace OpenSim.Data
         public abstract string GetVersion();
         public abstract string getName();
         public abstract void Initialise();
-        public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
+        public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
     }
 }

OpenSim/Framework/AgentInventory.cs

@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
@@ -230,7 +231,7 @@ namespace OpenSim.Framework
         public LLUUID CreatorID;
         public sbyte InvType;
         public sbyte Type;
-        public string Name = System.String.Empty;
+        public string Name = String.Empty;
         public string Description;
 
         public InventoryItem()
@@ -241,7 +242,7 @@ namespace OpenSim.Framework
         public string ExportString()
         {
             string typ = "notecard";
-            string result = System.String.Empty;
+            string result = String.Empty;
             result += "\tinv_object\t0\n\t{\n";
             result += "\t\tobj_id\t%s\n";
             result += "\t\tparent_id\t" + ItemID.ToString() + "\n";

OpenSim/Framework/AssetConfig.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs

@@ -28,14 +28,12 @@
 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;
-using OpenSim.Framework.Console;
-
 /// <summary>
 /// Loads assets from the filesystem location.  Not yet a plugin, though it should be.
 /// </summary>
@@ -43,7 +41,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 { 
     public class AssetLoaderFileSystem : IAssetLoader
     {
-        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 AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage)
         {

OpenSim/Framework/AvatarPickerAvatar.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.Framework

OpenSim/Framework/AvatarWearable.cs

@@ -25,10 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
 using System;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
+using libsecondlife;
 
 namespace OpenSim.Framework
 {
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
             //System.Console.WriteLine("AvatarWearable Deserialize BGN");
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid)));
@@ -93,7 +93,7 @@ namespace OpenSim.Framework
         {
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             info.AddValue("AssetID", AssetID.UUID);

OpenSim/Framework/ClientManager.cs

@@ -27,8 +27,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 
 namespace OpenSim.Framework
 {
@@ -36,7 +38,7 @@ namespace OpenSim.Framework
 
     public class ClientManager
     {
-        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 Dictionary<uint, IClientAPI> m_clients;
 
@@ -56,7 +58,7 @@ namespace OpenSim.Framework
                 {
                     whatToDo(LocalClients[i]);
                 }
-                catch (System.Exception e)
+                catch (Exception e)
                 {
                     m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString());
                 }
@@ -129,7 +131,7 @@ namespace OpenSim.Framework
                         client.Close(false);
                     }
                 }
-                catch (System.Exception e)
+                catch (Exception e)
                 {
                     m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e));
                 }

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;
         }
     }
 }

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 log4net;
-using OpenSim.Framework.Console;
 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
+        private static readonly ILog m_log
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = 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>

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;
 

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 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = 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()

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 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         /// <summary>
         /// The comms manager holds references to services (user, grid, inventory, etc.)

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;
 

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.Description = config.GetString("description", String.Empty);
-            item.Name = config.GetString("name", System.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);

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)
         {

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 log4net;
-using OpenSim.Framework.Console;
 
 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 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// The comms manager holds references to services (user, grid, inventory, etc.)

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 = 
+        private static readonly ILog m_log = 
-            log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private string m_httpListenerHostName;
         private uint m_httpListenPort;

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

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
 {

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 asset_type = String.Empty;
-        public string description = System.String.Empty;
+        public string description = String.Empty;
         public LLUUID folder_id = LLUUID.Zero;
-        public string inventory_type = System.String.Empty;
+        public string inventory_type = String.Empty;
-        public string name = System.String.Empty;
+        public string name = String.Empty;
 
         public LLSDAssetUploadRequest()
         {

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 uploader = String.Empty;
-        public string state = System.String.Empty;
+        public string state = String.Empty;
 
         public LLSDAssetUploadResponse()
         {

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

OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs

@@ -27,7 +27,6 @@
 */
 
 using System.Collections;
-using libsecondlife;
 
 namespace OpenSim.Region.Capabilities
 {

OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs

@@ -26,8 +26,6 @@
 * 
 */
 
-using libsecondlife;
-
 namespace OpenSim.Region.Capabilities
 {
     [LLSDMap]

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;
 

OpenSim/Framework/Communications/IInventoryServices.cs

@@ -26,9 +26,7 @@
  */
 
 using System.Collections.Generic;
-
 using libsecondlife;
-
 using OpenSim.Framework.Communications.Cache;
 
 namespace OpenSim.Framework.Communications

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 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
 

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>

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>

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

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));
             }            
         }  
         

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;

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);

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;
 

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 
+        private static readonly ILog m_log 
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public UserConfig _config;
         private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();

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

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

OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs

@@ -25,22 +25,24 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.IO;
 using System.Net;
+using System.Reflection;
 using System.Text;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework.Configuration.HTTP
 {
     public class HTTPConfiguration : IGenericConfig
     {
-        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 RemoteConfigSettings remoteConfigSettings;
 
         private XmlConfiguration xmlConfig;
 
-        private string configFileName = System.String.Empty;
+        private string configFileName = String.Empty;
 
         public HTTPConfiguration()
         {

OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs

@@ -25,13 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+
 namespace OpenSim.Framework.Configuration.HTTP
 {
     public class RemoteConfigSettings
     {
         private ConfigurationMember configMember;
 
-        public string baseConfigURL = System.String.Empty;
+        public string baseConfigURL = String.Empty;
 
         public RemoteConfigSettings(string filename)
         {

OpenSim/Framework/ConfigurationMember.cs

@@ -32,13 +32,14 @@ using System.Net;
 using System.Reflection;
 using System.Xml;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {
     public class ConfigurationMember
     {
-        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 delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
 

OpenSim/Framework/Console/ConsoleBase.cs

@@ -28,14 +28,15 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Net;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Framework.Console
 {
     public class ConsoleBase
     {
-        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 readonly object m_syncRoot = new object();
 

OpenSim/Framework/Console/OpenSimAppender.cs

@@ -26,14 +26,9 @@
  */
 
 using System;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Globalization;
-
-using log4net.Core;
-using log4net.Layout;
 using log4net.Appender;
-using log4net.Util;
+using log4net.Core;
 
 namespace OpenSim.Framework.Console
 {

OpenSim/Framework/Constants.cs

@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenSim.Framework
 {
     public class Constants

OpenSim/Framework/EstateSettings.cs

@@ -27,14 +27,15 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Framework
 {
     public class EstateSettings
     {
-        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);
 
         //Settings to this island
         private float m_billableFactor;

OpenSim/Framework/FriendListItem.cs

@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/GridConfig.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/GridInstantMessage.cs

@@ -26,7 +26,6 @@
  */
 
 using System;
-using OpenSim.Framework;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/IAssetServer.cs

@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/IInventoryData.cs

@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections;
 using System.Collections.Generic;
-using System.Xml.Serialization;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/InventoryCollection.cs

@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections;
 using System.Collections.Generic;
-using System.Xml.Serialization;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/InventoryConfig.cs

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Console;
+using System;
 
 namespace OpenSim.Framework
 {
@@ -34,12 +34,12 @@ namespace OpenSim.Framework
     /// </summary>
     public class InventoryConfig
     {
-        public string DefaultStartupMsg = System.String.Empty;
+        public string DefaultStartupMsg = String.Empty;
-        public string UserServerURL = System.String.Empty;
+        public string UserServerURL = String.Empty;
-        public string UserSendKey = System.String.Empty;
+        public string UserSendKey = String.Empty;
-        public string UserRecvKey = System.String.Empty;
+        public string UserRecvKey = String.Empty;
 
-        public string DatabaseProvider = System.String.Empty;
+        public string DatabaseProvider = String.Empty;
         public static uint DefaultHttpPort = 8004;
 
         public uint HttpPort = DefaultHttpPort;

OpenSim/Framework/InventoryFolderBase.cs

@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml.Serialization;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/InventoryItemBase.cs

@@ -25,9 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml.Serialization;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/JId.cs

@@ -26,8 +26,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenSim.Framework
 {

OpenSim/Framework/LandData.cs

@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Framework

OpenSim/Framework/Login.cs

@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using libsecondlife;
 
 namespace OpenSim.Framework
@@ -39,7 +40,7 @@ namespace OpenSim.Framework
         public LLUUID InventoryFolder;
         public LLUUID BaseFolder;
         public uint CircuitCode;
-        public string CapsPath = System.String.Empty;
+        public string CapsPath = String.Empty;
         public LLVector3 StartPos;
 
         public Login()

OpenSim/Framework/MessageServerConfig.cs

@@ -26,9 +26,6 @@
  */
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {
@@ -69,7 +66,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("default_user_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default User Server URI",
-                                                "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort.ToString() + "/", false);
+                                                "http://127.0.0.1:" + DefaultHttpPort.ToString() + "/", false);
             configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to user server", "null", false);
             configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

OpenSim/Framework/NetworkServersInfo.cs

@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using Nini.Config;
 using System;
+using Nini.Config;
 
 namespace OpenSim.Framework
 {