5 files changed, 19 insertions, 17 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 25a127b..2b63d2b 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/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
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 4ccea59..442ba39 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/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";
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index c8ba2af..66ce6ab 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/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 OpenSim.Framework.Console;
+using log4net;
 
 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;
 
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 85617e5..4355033 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/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";
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 089c9df..97797e0 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/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");
             }