* optimized usings.

2026-08-11 11:57:03 +08:00 · 2009-02-12 09:53:12 +00:00
parent d21601d497
commit 801da4346a
383 changed files with 1318 additions and 2154 deletions
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System.Data.SqlClient;
 using System.Data;
+using System.Data.SqlClient;

 namespace OpenSim.Data.MSSQL
 {
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -28,8 +28,8 @@
 using System;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MSSQL
@@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL
        /// <param name="connectionString">connect string</param>
        override public void Initialise(string connectionString)
        {
-            TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
+            TicksToEpoch = new DateTime(1970, 1, 1).Ticks;

            if (!string.IsNullOrEmpty(connectionString))
            {
@@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL
                    " VALUES " +
                    "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
            {
-                int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID));
                command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name));
                command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description));
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;

--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MSSQL
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MSSQL
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,8 +31,8 @@ using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;

 namespace OpenSim.Data.MSSQL
 {
@@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL
            {
                return value.ToString();
            }
-            if (valueType == typeof(OpenMetaverse.UUID))
+            if (valueType == typeof(UUID))
            {
                return value.ToString();
            }
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -26,11 +26,9 @@
 */

 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
-using System.Text;

 namespace OpenSim.Data.MSSQL
 {
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MSSQL
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Data

    public class Migration
    {
-        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 _type;
        private DbConnection _conn;
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -26,15 +26,13 @@
 */

 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;

-
 namespace OpenSim.Data.MySQL
 {
    /// <summary>
@@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
        /// <param name="connect">connect string</param>
        override public void Initialise(string connect)
        {
-            TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
+            TicksToEpoch = new DateTime(1970,1,1).Ticks;

            // TODO: This will let you pass in the connect string in
            // the config, though someone will need to write that.
@@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
                            {
                                asset.Metadata.Local = (bool)dbReader["local"];
                            }
-                            catch (System.InvalidCastException)
+                            catch (InvalidCastException)
                            {
                                asset.Metadata.Local = false;
                            }
@@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
                    using (cmd)
                    {
                        // create unix epoch time
-                        int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                        int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                        cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
                        cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
                        cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
                    using (cmd)
                    {
                        // create unix epoch time
-                        int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
+                        int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
                        cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
                        cmd.Parameters.AddWithValue("?access_time", now);
                        cmd.ExecuteNonQuery();
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;

 namespace OpenSim.Data.MySQL
 {
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
                cmd.Dispose();
            }

-            m_lastConnectionUse = System.DateTime.Now.Ticks;
+            m_lastConnectionUse = DateTime.Now.Ticks;

            m_log.DebugFormat(
                "[REGION DB]: Connection wait timeout {0} seconds",
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL

        protected void CheckConnection()
        {
-            long timeNow = System.DateTime.Now.Ticks;
+            long timeNow = DateTime.Now.Ticks;
            if (timeNow - m_lastConnectionUse > m_waitTimeout ||
                    m_connection.State != ConnectionState.Open)
            {
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
                        else
                            m_FieldMap[name].SetValue(es, false);
                    }
-                    else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
+                    else if (m_FieldMap[name].GetValue(es) is UUID)
                    {
                        UUID uuid = UUID.Zero;

--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,8 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
+using System.Threading;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MySQL
@@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
                if (lockedCons > m_maxConnections)
                {
                    lockedCons = 0;
-                    System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
+                    Thread.Sleep(1000); // Wait some time before searching them again.
                    m_log.Debug(
                        "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
                }
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MySQL
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 using System;
-using System.Reflection;
 using System.Collections.Generic;
+using System.Reflection;
 using log4net;
 using OpenSim.Framework;

--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -26,14 +26,14 @@
 */

 using System;
-using System.Collections.Generic;
 using System.Collections;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MySQL
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
                cmd.Dispose();
            }

-            m_lastConnectionUse = System.DateTime.Now.Ticks;
+            m_lastConnectionUse = DateTime.Now.Ticks;

            m_log.DebugFormat(
                "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
        {
            //m_log.Debug("[REGION DB]: Checking connection");

-            long timeNow = System.DateTime.Now.Ticks;
+            long timeNow = DateTime.Now.Ticks;
            if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
            {
                m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -28,13 +28,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
 using System.Threading;
-using System.Drawing;
-using OpenMetaverse;
 using log4net;
 using MySql.Data.MySqlClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
                }
                catch (Exception)
                {
-                    System.Threading.Thread.Sleep(500);
+                    Thread.Sleep(500);

                    m_Connection.Close();
                    m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
                }
                catch (Exception)
                {
-                    System.Threading.Thread.Sleep(500);
+                    Thread.Sleep(500);

                    m_Connection.Close();
                    m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,8 +31,9 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
+using System.Threading;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.MySQL
@@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
                if (lockedCons > m_maxConnections)
                {
                    lockedCons = 0;
-                    System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
+                    Thread.Sleep(1000); // Wait some time before searching them again.
                    m_log.Debug(
                        "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
                    m_log.Debug("Current connections-in-use dump:");
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -26,16 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.MySQL;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.MySQL.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ b/OpenSim/Data/NHibernate/ColorUserType.cs
@@ -27,12 +27,10 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
+using System.Drawing;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
-using System.Drawing;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,10 +27,10 @@

 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,10 +27,10 @@

 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,10 +27,10 @@

 using System;
 using System.Data;
-using OpenMetaverse;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -25,16 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
-using System.Collections;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
-using NHibernate;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -27,15 +27,14 @@


 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using log4net;
 using System.Reflection;
-using OpenSim.Framework;
+using log4net;
 using NHibernate;
 using NHibernate.Criterion;
-using System.Collections;
 using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.NHibernate
 {
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate
            }
        }

-        public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey)
+        public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
        {
            bool throwHissyFit = false; // Should be true by 1.0

@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate
            return DataResponse.RESPONSE_ERROR;
        }

-        public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID)
+        public override RegionProfileData GetProfileByUUID(UUID UUID)
        {
            return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID);
        }
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -27,15 +27,12 @@

 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -26,14 +26,14 @@
 */

 using System;
+using System.Data.Common;
 using System.Reflection;
-using System.IO;
 using log4net;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
 using OpenMetaverse;
-using Environment = NHibernate.Cfg.Environment;
+using Environment=NHibernate.Cfg.Environment;

 namespace OpenSim.Data.NHibernate
 {
@@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
                migrationSubType = "MySQLDialect";
            }

-            Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
+            Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
            migration.Update();
        }

--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -26,19 +26,15 @@
 */

 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Environment = NHibernate.Cfg.Environment;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -25,17 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using OpenMetaverse;
 using OpenSim.Framework;
-using Environment=NHibernate.Cfg.Environment;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ b/OpenSim/Data/NHibernate/SByteType.cs
@@ -27,8 +27,6 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -28,9 +28,9 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenSim.Framework;
 using log4net;
 using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -26,16 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -26,16 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -26,14 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -26,14 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -26,15 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -26,14 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -26,14 +26,8 @@
 */

 using System;
-using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -27,14 +27,8 @@

 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -27,14 +27,8 @@

 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenSim.Data.NHibernate;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -27,15 +27,8 @@

 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -27,14 +27,8 @@

 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -27,14 +27,8 @@

 using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.NHibernate;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.NHibernate.Tests
 {
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
            } 
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception {0}", e);
+                Console.WriteLine("Exception {0}", e);
                Assert.Ignore();
            }
        }
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,11 +27,11 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
+using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.NHibernate
 {
--- a/OpenSim/Data/NHibernate/UInt16Type.cs
+++ b/OpenSim/Data/NHibernate/UInt16Type.cs
@@ -27,8 +27,6 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
--- a/OpenSim/Data/NHibernate/UInt32Type.cs
+++ b/OpenSim/Data/NHibernate/UInt32Type.cs
@@ -27,8 +27,6 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
--- a/OpenSim/Data/NHibernate/UInt64Type.cs
+++ b/OpenSim/Data/NHibernate/UInt64Type.cs
@@ -27,8 +27,6 @@

 using System;
 using System.Data;
-using OpenMetaverse;
-using OpenSim.Framework;
 using NHibernate;
 using NHibernate.SqlTypes;
 using NHibernate.UserTypes;
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ b/OpenSim/Data/NHibernate/UserFriend.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 OpenMetaverse;

 namespace OpenSim.Data.NHibernate
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,8 +27,8 @@

 using System;
 using System.Collections;
-using OpenMetaverse;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
 using System;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.SQLite
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using Mono.Data.SqliteClient;
 using log4net;
+using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;

 namespace OpenSim.Data.SQLite
 {
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
                        else
                            m_FieldMap[name].SetValue(es, false);
                    }
-                    else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
+                    else if (m_FieldMap[name].GetValue(es) is UUID)
                    {
                        UUID uuid = UUID.Zero;

--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.SQLite
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.SQLite
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;

 namespace OpenSim.Data.SQLite
 {
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.IO;
 using System.Reflection;
-using System.Threading;
-using System.Drawing;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Mono.Data.SqliteClient;
+using OpenMetaverse;
 using OpenSim.Framework;

 namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
            try {
                aa = aplist[user];
                m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
-            } catch (System.Collections.Generic.KeyNotFoundException) {
+            } catch (KeyNotFoundException) {
                m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
            }
            return aa;
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
        public void Cleanup()
        {
            db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
        }
    }
 }
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.SQLite.Tests
 {
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;

 namespace OpenSim.Data.SQLite.Tests
 {
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
        public void Cleanup()
        {
            db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
        }
    }
 }
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
        public void Cleanup()
        {
            db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
        }
    }
 }
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System;
 using System.IO;
-using System.Collections.Generic;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Data.SQLite;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;

 namespace OpenSim.Data.SQLite.Tests
 {
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
        public void Cleanup()
        {
            db.Dispose();
-            System.IO.File.Delete(file);
+            File.Delete(file);
        }
    }
 }
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -26,13 +26,11 @@
 */

 using System;
-using System.Collections.Generic;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.Tests
 {
@@ -48,7 +46,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -26,14 +26,11 @@
 */

 using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
-using OpenSim.Data;
 using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;

 namespace OpenSim.Data.Tests
@@ -49,7 +46,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -28,11 +28,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;

 namespace OpenSim.Data.Tests
@@ -49,7 +47,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -26,13 +26,11 @@
 */

 using System;
-using System.Collections.Generic;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
-using OpenSim.Data;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.Tests
 {
@@ -67,7 +65,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -29,14 +29,13 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Data;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Land;
-using OpenMetaverse;

 namespace OpenSim.Data.Tests
 {
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
@@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
+                Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
                Assert.Fail();
            }
                    
@@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
            }
            catch (Exception e)
            {
-                System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
+                Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
                Assert.Fail();
            }

@@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
        }
        
        [Test]
-        [ExpectedException(typeof(System.ArgumentException))]
+        [ExpectedException(typeof(ArgumentException))]
        public void T026_PrimInventoryMany()
        {
            UUID i1,i2,i3,i4;
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -30,12 +30,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Data;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;

 namespace OpenSim.Data.Tests
 {
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch (Exception)
            {
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,10 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-using System.Reflection;
 using System.Collections.Generic;
 using OpenMetaverse;
-using log4net;
 using OpenSim.Framework;

 namespace OpenSim.Data