* Optimized usings

* Shortened type references
* Removed redundant 'this' qualifier

7 files changed, 458 insertions, 384 deletions

diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
index 75bb53d..6693c98 100644
--- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
@@ -1,24 +1,28 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+
+[assembly : AssemblyTitle("OpenSim.Framework.Data.SQLite")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("")]
+[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")]
+[assembly : AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
+[assembly : ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("6113d5ce-4547-49f4-9236-0dcc503457b1")]
+
+[assembly : Guid("6113d5ce-4547-49f4-9236-0dcc503457b1")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -29,5 +33,6 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly : AssemblyVersion("0.4.0.0")]
+[assembly : AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
index a85ab4d..4187078 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
@@ -26,15 +26,11 @@
 * 
 */
 using System;
-using System.IO;
-using libsecondlife;
-using OpenSim.Framework;
 using System.Data;
-using System.Data.SqlTypes;
+using System.Reflection;
+using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
-using OpenSim.Framework;
-using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Framework.Data.SQLite
 {
@@ -46,11 +42,11 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// The database manager
         /// </summary>
-
         /// <summary>
         /// Artificial constructor called upon plugin load
         /// </summary>
         private const string assetSelect = "select * from assets";
+
         private DataSet ds;
         private SqliteDataAdapter da;
 
@@ -58,13 +54,14 @@ namespace OpenSim.Framework.Data.SQLite
         {
             SqliteConnection conn = new SqliteConnection("URI=file:" + dbfile + ",version=3");
             TestTables(conn);
-            
+
             ds = new DataSet();
             da = new SqliteDataAdapter(new SqliteCommand(assetSelect, conn));
 
-            lock (ds) {
+            lock (ds)
+            {
                 ds.Tables.Add(createAssetsTable());
-                
+
                 setupAssetCommands(da, conn);
                 try
                 {
@@ -75,11 +72,11 @@ namespace OpenSim.Framework.Data.SQLite
                     MainLog.Instance.Verbose("AssetStorage", "Caught fill error on asset table");
                 }
             }
-            
+
             return;
         }
 
-        public AssetBase FetchAsset(LLUUID uuid) 
+        public AssetBase FetchAsset(LLUUID uuid)
         {
             AssetBase asset = new AssetBase();
             DataRow row = ds.Tables["assets"].Rows.Find(uuid);
@@ -92,27 +89,28 @@ namespace OpenSim.Framework.Data.SQLite
                 return null;
             }
         }
-        
-        public void CreateAsset(AssetBase asset) 
+
+        public void CreateAsset(AssetBase asset)
         {
             // no difference for now
             UpdateAsset(asset);
         }
-        
-        public void UpdateAsset(AssetBase asset) 
+
+        public void UpdateAsset(AssetBase asset)
         {
             LogAssetLoad(asset);
 
             DataTable assets = ds.Tables["assets"];
-            lock(ds) {
+            lock (ds)
+            {
                 DataRow row = assets.Rows.Find(asset.FullID);
-                if (row == null) 
+                if (row == null)
                 {
                     row = assets.NewRow();
                     fillAssetRow(row, asset);
                     assets.Rows.Add(row);
                 }
-                else 
+                else
                 {
                     fillAssetRow(row, asset);
                 }
@@ -124,9 +122,10 @@ namespace OpenSim.Framework.Data.SQLite
             string temporary = asset.Temporary ? "Temporary" : "Stored";
             string local = asset.Local ? "Local" : "Remote";
 
-            MainLog.Instance.Verbose("ASSETSTORAGE", 
-                                     string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)", 
-                                                   asset.FullID, asset.Name, asset.Description, asset.Type, asset.InvType, temporary, local, asset.Data.Length) );
+            MainLog.Instance.Verbose("ASSETSTORAGE",
+                                     string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
+                                                   asset.FullID, asset.Name, asset.Description, asset.Type,
+                                                   asset.InvType, temporary, local, asset.Data.Length));
         }
 
         public bool ExistsAsset(LLUUID uuid)
@@ -137,23 +136,26 @@ namespace OpenSim.Framework.Data.SQLite
 
         public void DeleteAsset(LLUUID uuid)
         {
-            lock (ds) {
+            lock (ds)
+            {
                 DataRow row = ds.Tables["assets"].Rows.Find(uuid);
-                if (row != null) {
+                if (row != null)
+                {
                     row.Delete();
                 }
             }
         }
-        
+
         public void CommitAssets() // force a sync to the database
         {
             MainLog.Instance.Verbose("AssetStorage", "Attempting commit");
-            lock (ds) {
+            lock (ds)
+            {
                 da.Update(ds, "assets");
                 ds.AcceptChanges();
             }
         }
-        
+
         /***********************************************************************
          *
          *  Database Definition Functions
@@ -161,24 +163,24 @@ namespace OpenSim.Framework.Data.SQLite
          *  This should be db agnostic as we define them in ADO.NET terms
          *
          **********************************************************************/
-        
+
         private DataTable createAssetsTable()
         {
             DataTable assets = new DataTable("assets");
 
-            createCol(assets, "UUID", typeof(System.String));
-            createCol(assets, "Name", typeof(System.String));
-            createCol(assets, "Description", typeof(System.String));
-            createCol(assets, "Type", typeof(System.Int32));
-            createCol(assets, "InvType", typeof(System.Int32));
-            createCol(assets, "Local", typeof(System.Boolean));
-            createCol(assets, "Temporary", typeof(System.Boolean));
-            createCol(assets, "Data", typeof(System.Byte[]));
+            createCol(assets, "UUID", typeof (String));
+            createCol(assets, "Name", typeof (String));
+            createCol(assets, "Description", typeof (String));
+            createCol(assets, "Type", typeof (Int32));
+            createCol(assets, "InvType", typeof (Int32));
+            createCol(assets, "Local", typeof (Boolean));
+            createCol(assets, "Temporary", typeof (Boolean));
+            createCol(assets, "Data", typeof (Byte[]));
             // Add in contraints
-            assets.PrimaryKey = new DataColumn[] { assets.Columns["UUID"] };
+            assets.PrimaryKey = new DataColumn[] {assets.Columns["UUID"]};
             return assets;
         }
-        
+
         /***********************************************************************
          *  
          *  Convert between ADO.NET <=> OpenSim Objects
@@ -193,19 +195,19 @@ namespace OpenSim.Framework.Data.SQLite
             // interesting has to be done to actually get these values
             // back out.  Not enough time to figure it out yet.
             AssetBase asset = new AssetBase();
-            
-            asset.FullID = new LLUUID((String)row["UUID"]);
-            asset.Name = (String)row["Name"];
-            asset.Description = (String)row["Description"];
+
+            asset.FullID = new LLUUID((String) row["UUID"]);
+            asset.Name = (String) row["Name"];
+            asset.Description = (String) row["Description"];
             asset.Type = Convert.ToSByte(row["Type"]);
             asset.InvType = Convert.ToSByte(row["InvType"]);
             asset.Local = Convert.ToBoolean(row["Local"]);
             asset.Temporary = Convert.ToBoolean(row["Temporary"]);
-            asset.Data = (byte[])row["Data"];
+            asset.Data = (byte[]) row["Data"];
             return asset;
         }
 
-        
+
         private void fillAssetRow(DataRow row, AssetBase asset)
         {
             row["UUID"] = asset.FullID;
@@ -225,8 +227,10 @@ namespace OpenSim.Framework.Data.SQLite
             row["Data"] = asset.Data;
 
             // ADO.NET doesn't handle NULL very well
-            foreach (DataColumn col in ds.Tables["assets"].Columns) {
-                if (row[col] == null) {
+            foreach (DataColumn col in ds.Tables["assets"].Columns)
+            {
+                if (row[col] == null)
+                {
                     row[col] = "";
                 }
             }
@@ -250,18 +254,18 @@ namespace OpenSim.Framework.Data.SQLite
             da.UpdateCommand.Connection = conn;
 
             SqliteCommand delete = new SqliteCommand("delete from assets where UUID = :UUID");
-            delete.Parameters.Add(createSqliteParameter("UUID", typeof(System.String)));
+            delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
             delete.Connection = conn;
             da.DeleteCommand = delete;
         }
-        
+
         private void InitDB(SqliteConnection conn)
         {
             string createAssets = defineTable(createAssetsTable());
             SqliteCommand pcmd = new SqliteCommand(createAssets, conn);
             conn.Open();
             pcmd.ExecuteNonQuery();
-            conn.Close(); 
+            conn.Close();
         }
 
         private bool TestTables(SqliteConnection conn)
@@ -269,9 +273,12 @@ namespace OpenSim.Framework.Data.SQLite
             SqliteCommand cmd = new SqliteCommand(assetSelect, conn);
             SqliteDataAdapter pDa = new SqliteDataAdapter(cmd);
             DataSet tmpDS = new DataSet();
-            try {
+            try
+            {
                 pDa.Fill(tmpDS, "assets");
-            } catch (Mono.Data.SqliteClient.SqliteSyntaxException) {
+            }
+            catch (SqliteSyntaxException)
+            {
                 MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating");
                 InitDB(conn);
             }
@@ -279,14 +286,18 @@ namespace OpenSim.Framework.Data.SQLite
         }
 
         #region IPlugin interface
-        public string Version {
+
+        public string Version
+        {
             get
             {
-                System.Reflection.Module module = this.GetType().Module;
+                Module module = GetType().Module;
                 string dllName = module.Assembly.ManifestModule.Name;
                 Version dllVersion = module.Assembly.GetName().Version;
 
-                return string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
+                return
+                    string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
+                                  dllVersion.Revision);
             }
         }
 
@@ -295,9 +306,11 @@ namespace OpenSim.Framework.Data.SQLite
             Initialise("AssetStorage.db", "");
         }
 
-        public string Name {
+        public string Name
+        {
             get { return "SQLite Asset storage engine"; }
         }
+
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
index 4f237fd..157b4e6 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
@@ -26,13 +26,8 @@
 * 
 */
 using System;
-using System.IO;
-using libsecondlife;
-using OpenSim.Framework;
 using System.Data;
-using System.Data.SqlTypes;
 using Mono.Data.SqliteClient;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.SQLite
 {
@@ -48,8 +43,8 @@ namespace OpenSim.Framework.Data.SQLite
          *  This should be db agnostic as we define them in ADO.NET terms
          *
          **********************************************************************/
-        
-        protected static void createCol(DataTable dt, string name, System.Type type)
+
+        protected static void createCol(DataTable dt, string name, Type type)
         {
             DataColumn col = new DataColumn(name, type);
             dt.Columns.Add(col);
@@ -77,7 +72,8 @@ namespace OpenSim.Framework.Data.SQLite
              *  generate these strings instead of typing them out.
              */
             string[] cols = new string[dt.Columns.Count];
-            for (int i = 0; i < dt.Columns.Count; i++) {
+            for (int i = 0; i < dt.Columns.Count; i++)
+            {
                 DataColumn col = dt.Columns[i];
                 cols[i] = col.ColumnName;
             }
@@ -92,7 +88,7 @@ namespace OpenSim.Framework.Data.SQLite
 
             // this provides the binding for all our parameters, so
             // much less code than it used to be
-            foreach (DataColumn col in dt.Columns) 
+            foreach (DataColumn col in dt.Columns)
             {
                 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
             }
@@ -106,7 +102,8 @@ namespace OpenSim.Framework.Data.SQLite
             foreach (DataColumn col in dt.Columns)
             {
                 if (subsql.Length > 0)
-                { // a map function would rock so much here
+                {
+                    // a map function would rock so much here
                     subsql += ", ";
                 }
                 subsql += col.ColumnName + "= :" + col.ColumnName;
@@ -118,7 +115,7 @@ namespace OpenSim.Framework.Data.SQLite
             // this provides the binding for all our parameters, so
             // much less code than it used to be
 
-            foreach (DataColumn col in dt.Columns) 
+            foreach (DataColumn col in dt.Columns)
             {
                 cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
             }
@@ -133,11 +130,12 @@ namespace OpenSim.Framework.Data.SQLite
             foreach (DataColumn col in dt.Columns)
             {
                 if (subsql.Length > 0)
-                { // a map function would rock so much here
+                {
+                    // a map function would rock so much here
                     subsql += ",\n";
                 }
                 subsql += col.ColumnName + " " + sqliteType(col.DataType);
-                if(col == dt.PrimaryKey[0])
+                if (col == dt.PrimaryKey[0])
                 {
                     subsql += " primary key";
                 }
@@ -167,7 +165,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// for us.
         ///</summary>
         ///<returns>a built sqlite parameter</returns>
-        protected static SqliteParameter createSqliteParameter(string name, System.Type type)
+        protected static SqliteParameter createSqliteParameter(string name, Type type)
         {
             SqliteParameter param = new SqliteParameter();
             param.ParameterName = ":" + name;
@@ -182,53 +180,87 @@ namespace OpenSim.Framework.Data.SQLite
          *  Type conversion functions
          *
          **********************************************************************/
-        
+
         protected static DbType dbtypeFromType(Type type)
         {
-            if (type == typeof(System.String)) {
+            if (type == typeof (String))
+            {
                 return DbType.String;
-            } else if (type == typeof(System.Int32)) {
+            }
+            else if (type == typeof (Int32))
+            {
                 return DbType.Int32;
-            } else if (type == typeof(System.UInt32)) {
+            }
+            else if (type == typeof (UInt32))
+            {
                 return DbType.UInt32;
-            } else if (type == typeof(System.Int64)) {
+            }
+            else if (type == typeof (Int64))
+            {
                 return DbType.Int64;
-            } else if (type == typeof(System.UInt64)) {
+            }
+            else if (type == typeof (UInt64))
+            {
                 return DbType.UInt64;
-            } else if (type == typeof(System.Double)) {
+            }
+            else if (type == typeof (Double))
+            {
                 return DbType.Double;
-            } else if (type == typeof(System.Boolean)) {
+            }
+            else if (type == typeof (Boolean))
+            {
                 return DbType.Boolean;
-            } else if (type == typeof(System.Byte[])) {
+            }
+            else if (type == typeof (Byte[]))
+            {
                 return DbType.Binary;
-            } else {
+            }
+            else
+            {
                 return DbType.String;
             }
         }
-        
+
         // this is something we'll need to implement for each db
         // slightly differently.
         protected static string sqliteType(Type type)
         {
-            if (type == typeof(System.String)) {
+            if (type == typeof (String))
+            {
                 return "varchar(255)";
-            } else if (type == typeof(System.Int32)) {
+            }
+            else if (type == typeof (Int32))
+            {
                 return "integer";
-            } else if (type == typeof(System.UInt32)) {
+            }
+            else if (type == typeof (UInt32))
+            {
                 return "integer";
-            } else if (type == typeof(System.Int64)) {
+            }
+            else if (type == typeof (Int64))
+            {
                 return "varchar(255)";
-            } else if (type == typeof(System.UInt64)) {
+            }
+            else if (type == typeof (UInt64))
+            {
                 return "varchar(255)";
-            } else if (type == typeof(System.Double)) {
+            }
+            else if (type == typeof (Double))
+            {
                 return "float";
-            } else if (type == typeof(System.Boolean)) {
+            }
+            else if (type == typeof (Boolean))
+            {
                 return "integer";
-            } else if (type == typeof(System.Byte[])) {
+            }
+            else if (type == typeof (Byte[]))
+            {
                 return "blob";
-            } else {
+            }
+            else
+            {
                 return "string";
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 2fc80b4..8f3e8aa 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -192,4 +192,4 @@ namespace OpenSim.Framework.Data.SQLite
             return null;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index 82a8434..5e95878 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -28,22 +28,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Data;
 using System.Reflection;
-
-using OpenSim.Framework.Console;
-using OpenSim.Framework;
-using OpenSim.Framework;
 using libsecondlife;
-
-using System.Data;
-using System.Data.SqlTypes;
-
 using Mono.Data.SqliteClient;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.SQLite
 {
-
     public class SQLiteInventoryStore : SQLiteBase, IInventoryData
     {
         private const string invItemsSelect = "select * from inventoryitems";
@@ -96,14 +88,14 @@ namespace OpenSim.Framework.Data.SQLite
         public InventoryItemBase buildItem(DataRow row)
         {
             InventoryItemBase item = new InventoryItemBase();
-            item.inventoryID = new LLUUID((string)row["UUID"]);
-            item.assetID = new LLUUID((string)row["assetID"]);
+            item.inventoryID = new LLUUID((string) row["UUID"]);
+            item.assetID = new LLUUID((string) row["assetID"]);
             item.assetType = Convert.ToInt32(row["assetType"]);
             item.invType = Convert.ToInt32(row["invType"]);
-            item.parentFolderID = new LLUUID((string)row["parentFolderID"]);
-            item.avatarID = new LLUUID((string)row["avatarID"]);
-            item.creatorsID = new LLUUID((string)row["creatorsID"]);
-            item.inventoryName =(string) row["inventoryName"];
+            item.parentFolderID = new LLUUID((string) row["parentFolderID"]);
+            item.avatarID = new LLUUID((string) row["avatarID"]);
+            item.creatorsID = new LLUUID((string) row["creatorsID"]);
+            item.inventoryName = (string) row["inventoryName"];
             item.inventoryDescription = (string) row["inventoryDescription"];
 
             item.inventoryNextPermissions = Convert.ToUInt32(row["inventoryNextPermissions"]);
@@ -147,7 +139,7 @@ namespace OpenSim.Framework.Data.SQLite
                 fillFolderRow(inventoryRow, folder);
             }
 
-            this.invFoldersDa.Update(ds, "inventoryfolders");
+            invFoldersDa.Update(ds, "inventoryfolders");
         }
 
         private void addItem(InventoryItemBase item)
@@ -165,7 +157,7 @@ namespace OpenSim.Framework.Data.SQLite
             {
                 fillItemRow(inventoryRow, item);
             }
-            this.invItemsDa.Update(ds, "inventoryitems");
+            invItemsDa.Update(ds, "inventoryitems");
         }
 
         public void Shutdown()
@@ -195,12 +187,14 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A string containing the plugin version</returns>
         public string getVersion()
         {
-            System.Reflection.Module module = this.GetType().Module;
+            Module module = GetType().Module;
             string dllName = module.Assembly.ManifestModule.Name;
             Version dllVersion = module.Assembly.GetName().Version;
 
 
-            return string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
+            return
+                string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
+                              dllVersion.Revision);
         }
 
         /// <summary>
@@ -306,7 +300,7 @@ namespace OpenSim.Framework.Data.SQLite
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             getInventoryFolders(ref folders, parentID);
 
-            for(int i=0; i<folders.Count; i++)
+            for (int i = 0; i < folders.Count; i++)
                 getInventoryFolders(ref folders, folders[i].folderID);
 
             return folders;
@@ -320,9 +314,12 @@ namespace OpenSim.Framework.Data.SQLite
         public InventoryItemBase getInventoryItem(LLUUID item)
         {
             DataRow row = ds.Tables["inventoryitems"].Rows.Find(item);
-            if (row != null) {
+            if (row != null)
+            {
                 return buildItem(row);
-            } else {
+            }
+            else
+            {
                 return null;
             }
         }
@@ -334,19 +331,21 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A class containing folder information</returns>
         public InventoryFolderBase getInventoryFolder(LLUUID folder)
         {
-          
-          // TODO: Deep voodoo here.  If you enable this code then
-          // multi region breaks.  No idea why, but I figured it was
-          // better to leave multi region at this point.  It does mean
-          // that you don't get to see system textures why creating
-          // clothes and the like. :(
-          
-          DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder);
-          if (row != null) {
+            // TODO: Deep voodoo here.  If you enable this code then
+            // multi region breaks.  No idea why, but I figured it was
+            // better to leave multi region at this point.  It does mean
+            // that you don't get to see system textures why creating
+            // clothes and the like. :(
+
+            DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder);
+            if (row != null)
+            {
                 return buildFolder(row);
-          } else {
+            }
+            else
+            {
                 return null;
-          }
+            }
         }
 
         /// <summary>
@@ -355,7 +354,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="item">The item to be created</param>
         public void addInventoryItem(InventoryItemBase item)
         {
-            this.addItem(item);
+            addItem(item);
         }
 
         /// <summary>
@@ -364,7 +363,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="item">The updated item</param>
         public void updateInventoryItem(InventoryItemBase item)
         {
-            this.addItem(item);
+            addItem(item);
         }
 
         /// <summary>
@@ -376,12 +375,12 @@ namespace OpenSim.Framework.Data.SQLite
             DataTable inventoryItemTable = ds.Tables["inventoryitems"];
 
             DataRow inventoryRow = inventoryItemTable.Rows.Find(itemID);
-             if (inventoryRow != null)
-             {
-                 inventoryRow.Delete();
-             }
+            if (inventoryRow != null)
+            {
+                inventoryRow.Delete();
+            }
 
-             this.invItemsDa.Update(ds, "inventoryitems");
+            invItemsDa.Update(ds, "inventoryitems");
         }
 
 
@@ -394,7 +393,7 @@ namespace OpenSim.Framework.Data.SQLite
         {
             List<InventoryItemBase> items = getInventoryInFolder(folderId);
 
-            foreach(InventoryItemBase i in items)
+            foreach (InventoryItemBase i in items)
                 deleteInventoryItem(i.inventoryID);
         }
 
@@ -404,7 +403,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="folder">The inventory folder</param>
         public void addInventoryFolder(InventoryFolderBase folder)
         {
-            this.addFolder(folder);
+            addFolder(folder);
         }
 
         /// <summary>
@@ -413,7 +412,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="folder">The inventory folder</param>
         public void updateInventoryFolder(InventoryFolderBase folder)
         {
-            this.addFolder(folder);
+            addFolder(folder);
         }
 
 
@@ -427,7 +426,7 @@ namespace OpenSim.Framework.Data.SQLite
         public void deleteInventoryFolder(LLUUID folderID)
         {
             List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
-    
+
             DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
             DataRow inventoryRow;
 
@@ -450,7 +449,7 @@ namespace OpenSim.Framework.Data.SQLite
                 inventoryRow.Delete();
             }
 
-            this.invFoldersDa.Update(ds, "inventoryfolders");
+            invFoldersDa.Update(ds, "inventoryfolders");
         }
 
         /***********************************************************************
@@ -458,43 +457,43 @@ namespace OpenSim.Framework.Data.SQLite
          *  Data Table definitions
          *
          **********************************************************************/
-        
+
         private static DataTable createInventoryItemsTable()
         {
             DataTable inv = new DataTable("inventoryitems");
-            
-            createCol(inv, "UUID", typeof(System.String)); //inventoryID
-            createCol(inv, "assetID", typeof(System.String));
-            createCol(inv, "assetType", typeof(System.Int32));
-            createCol(inv, "invType", typeof(System.Int32));
-            createCol(inv, "parentFolderID", typeof(System.String));
-            createCol(inv, "avatarID", typeof(System.String));
-            createCol(inv, "creatorsID", typeof(System.String));
-
-            createCol(inv, "inventoryName", typeof(System.String));
-            createCol(inv, "inventoryDescription", typeof(System.String));
+
+            createCol(inv, "UUID", typeof (String)); //inventoryID
+            createCol(inv, "assetID", typeof (String));
+            createCol(inv, "assetType", typeof (Int32));
+            createCol(inv, "invType", typeof (Int32));
+            createCol(inv, "parentFolderID", typeof (String));
+            createCol(inv, "avatarID", typeof (String));
+            createCol(inv, "creatorsID", typeof (String));
+
+            createCol(inv, "inventoryName", typeof (String));
+            createCol(inv, "inventoryDescription", typeof (String));
             // permissions
-            createCol(inv, "inventoryNextPermissions", typeof(System.Int32));
-            createCol(inv, "inventoryCurrentPermissions", typeof(System.Int32));
-            createCol(inv, "inventoryBasePermissions", typeof(System.Int32));
-            createCol(inv, "inventoryEveryOnePermissions", typeof(System.Int32));
-            
-            inv.PrimaryKey = new DataColumn[] { inv.Columns["UUID"] };
+            createCol(inv, "inventoryNextPermissions", typeof (Int32));
+            createCol(inv, "inventoryCurrentPermissions", typeof (Int32));
+            createCol(inv, "inventoryBasePermissions", typeof (Int32));
+            createCol(inv, "inventoryEveryOnePermissions", typeof (Int32));
+
+            inv.PrimaryKey = new DataColumn[] {inv.Columns["UUID"]};
             return inv;
         }
-        
+
         private DataTable createInventoryFoldersTable()
         {
             DataTable fol = new DataTable("inventoryfolders");
-            
-            createCol(fol, "UUID", typeof(System.String)); //folderID
-            createCol(fol, "name", typeof(System.String));
-            createCol(fol, "agentID", typeof(System.String));
-            createCol(fol, "parentID", typeof(System.String));
-            createCol(fol, "type", typeof(System.Int32));
-            createCol(fol, "version", typeof(System.Int32));
-            
-            fol.PrimaryKey = new DataColumn[] { fol.Columns["UUID"] };
+
+            createCol(fol, "UUID", typeof (String)); //folderID
+            createCol(fol, "name", typeof (String));
+            createCol(fol, "agentID", typeof (String));
+            createCol(fol, "parentID", typeof (String));
+            createCol(fol, "type", typeof (Int32));
+            createCol(fol, "version", typeof (Int32));
+
+            fol.PrimaryKey = new DataColumn[] {fol.Columns["UUID"]};
             return fol;
         }
 
@@ -507,7 +506,7 @@ namespace OpenSim.Framework.Data.SQLite
             da.UpdateCommand.Connection = conn;
 
             SqliteCommand delete = new SqliteCommand("delete from inventoryitems where UUID = :UUID");
-            delete.Parameters.Add(createSqliteParameter("UUID", typeof(System.String)));
+            delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
             delete.Connection = conn;
             da.DeleteCommand = delete;
         }
@@ -521,7 +520,7 @@ namespace OpenSim.Framework.Data.SQLite
             da.UpdateCommand.Connection = conn;
 
             SqliteCommand delete = new SqliteCommand("delete from inventoryfolders where UUID = :UUID");
-            delete.Parameters.Add(createSqliteParameter("UUID", typeof(System.String)));
+            delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
             delete.Connection = conn;
             da.DeleteCommand = delete;
         }
@@ -529,10 +528,10 @@ namespace OpenSim.Framework.Data.SQLite
         private InventoryFolderBase buildFolder(DataRow row)
         {
             InventoryFolderBase folder = new InventoryFolderBase();
-            folder.folderID = new LLUUID((string)row["UUID"]);
-            folder.name = (string)row["name"];
-            folder.agentID = new LLUUID((string)row["agentID"]);
-            folder.parentID = new LLUUID((string)row["parentID"]);
+            folder.folderID = new LLUUID((string) row["UUID"]);
+            folder.name = (string) row["name"];
+            folder.agentID = new LLUUID((string) row["agentID"]);
+            folder.parentID = new LLUUID((string) row["parentID"]);
             folder.type = Convert.ToInt16(row["type"]);
             folder.version = Convert.ToUInt16(row["version"]);
             return folder;
@@ -554,17 +553,18 @@ namespace OpenSim.Framework.Data.SQLite
          *  Test and Initialization code
          *
          **********************************************************************/
+
         private void InitDB(SqliteConnection conn)
         {
             string createInventoryItems = defineTable(createInventoryItemsTable());
             string createInventoryFolders = defineTable(createInventoryFoldersTable());
-            
+
             SqliteCommand pcmd = new SqliteCommand(createInventoryItems, conn);
             SqliteCommand scmd = new SqliteCommand(createInventoryFolders, conn);
             conn.Open();
             pcmd.ExecuteNonQuery();
             scmd.ExecuteNonQuery();
-            conn.Close(); 
+            conn.Close();
         }
 
         private bool TestTables(SqliteConnection conn)
@@ -575,10 +575,13 @@ namespace OpenSim.Framework.Data.SQLite
             SqliteDataAdapter sDa = new SqliteDataAdapter(invFoldersSelectCmd);
 
             DataSet tmpDS = new DataSet();
-            try {
+            try
+            {
                 pDa.Fill(tmpDS, "inventoryitems");
                 sDa.Fill(tmpDS, "inventoryfolders");
-            } catch (Mono.Data.SqliteClient.SqliteSyntaxException) {
+            }
+            catch (SqliteSyntaxException)
+            {
                 MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating");
                 InitDB(conn);
             }
@@ -586,14 +589,18 @@ namespace OpenSim.Framework.Data.SQLite
             pDa.Fill(tmpDS, "inventoryitems");
             sDa.Fill(tmpDS, "inventoryfolders");
 
-            foreach (DataColumn col in createInventoryItemsTable().Columns) {
-                if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName) ) {
+            foreach (DataColumn col in createInventoryItemsTable().Columns)
+            {
+                if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName))
+                {
                     MainLog.Instance.Verbose("DATASTORE", "Missing required column:" + col.ColumnName);
                     return false;
                 }
             }
-            foreach (DataColumn col in createInventoryFoldersTable().Columns) {
-                if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName) ) {
+            foreach (DataColumn col in createInventoryFoldersTable().Columns)
+            {
+                if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName))
+                {
                     MainLog.Instance.Verbose("DATASTORE", "Missing required column:" + col.ColumnName);
                     return false;
                 }
@@ -601,8 +608,4 @@ namespace OpenSim.Framework.Data.SQLite
             return true;
         }
     }
-}
-
-
-
-
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index 5954fba..e102da3 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -30,13 +30,14 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using libsecondlife;
+using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.SQLite
 {
-    class SQLiteManager : SQLiteBase
+    internal class SQLiteManager : SQLiteBase
     {
-        IDbConnection dbcon;
+        private IDbConnection dbcon;
 
         /// <summary>
         /// Initialises and creates a new SQLite connection and maintains it.
@@ -78,15 +79,15 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A SQLite DB Command</returns>
         public IDbCommand Query(string sql, Dictionary<string, string> parameters)
         {
-            SQLiteCommand dbcommand = (SQLiteCommand)dbcon.CreateCommand();
+            SQLiteCommand dbcommand = (SQLiteCommand) dbcon.CreateCommand();
             dbcommand.CommandText = sql;
             foreach (KeyValuePair<string, string> param in parameters)
             {
-                SQLiteParameter paramx = new SQLiteParameter(param.Key,param.Value);
+                SQLiteParameter paramx = new SQLiteParameter(param.Key, param.Value);
                 dbcommand.Parameters.Add(paramx);
             }
 
-            return (IDbCommand)dbcommand;
+            return (IDbCommand) dbcommand;
         }
 
         private bool TestTables(SQLiteConnection conn)
@@ -98,7 +99,7 @@ namespace OpenSim.Framework.Data.SQLite
             {
                 pDa.Fill(tmpDS, "regions");
             }
-            catch (Mono.Data.SqliteClient.SqliteSyntaxException)
+            catch (SqliteSyntaxException)
             {
                 MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating");
                 InitDB(conn);
@@ -110,39 +111,39 @@ namespace OpenSim.Framework.Data.SQLite
         {
             DataTable regions = new DataTable("regions");
 
-            createCol(regions, "regionHandle", typeof(ulong));
-            createCol(regions, "regionName", typeof(System.String));
-            createCol(regions, "uuid", typeof(System.String));
-
-            createCol(regions, "regionRecvKey", typeof(System.String));
-            createCol(regions, "regionSecret", typeof(System.String));
-            createCol(regions, "regionSendKey", typeof(System.String));
-            
-            createCol(regions, "regionDataURI", typeof(System.String));
-            createCol(regions, "serverIP", typeof(System.String));
-            createCol(regions, "serverPort", typeof(System.String));
-            createCol(regions, "serverURI", typeof(System.String));
-
-            
-            createCol(regions, "locX", typeof( uint));
-            createCol(regions, "locY", typeof( uint));
-            createCol(regions, "locZ", typeof( uint));
-
-            createCol(regions, "eastOverrideHandle", typeof( ulong ));
-            createCol(regions, "westOverrideHandle", typeof( ulong ));
-            createCol(regions, "southOverrideHandle", typeof( ulong ));
-            createCol(regions, "northOverrideHandle", typeof( ulong ));
-
-            createCol(regions, "regionAssetURI", typeof(System.String));
-            createCol(regions, "regionAssetRecvKey", typeof(System.String));
-            createCol(regions, "regionAssetSendKey", typeof(System.String));
-
-            createCol(regions, "regionUserURI", typeof(System.String));
-            createCol(regions, "regionUserRecvKey", typeof(System.String));
-            createCol(regions, "regionUserSendKey", typeof(System.String));
+            createCol(regions, "regionHandle", typeof (ulong));
+            createCol(regions, "regionName", typeof (String));
+            createCol(regions, "uuid", typeof (String));
+
+            createCol(regions, "regionRecvKey", typeof (String));
+            createCol(regions, "regionSecret", typeof (String));
+            createCol(regions, "regionSendKey", typeof (String));
+
+            createCol(regions, "regionDataURI", typeof (String));
+            createCol(regions, "serverIP", typeof (String));
+            createCol(regions, "serverPort", typeof (String));
+            createCol(regions, "serverURI", typeof (String));
+
+
+            createCol(regions, "locX", typeof (uint));
+            createCol(regions, "locY", typeof (uint));
+            createCol(regions, "locZ", typeof (uint));
+
+            createCol(regions, "eastOverrideHandle", typeof (ulong));
+            createCol(regions, "westOverrideHandle", typeof (ulong));
+            createCol(regions, "southOverrideHandle", typeof (ulong));
+            createCol(regions, "northOverrideHandle", typeof (ulong));
+
+            createCol(regions, "regionAssetURI", typeof (String));
+            createCol(regions, "regionAssetRecvKey", typeof (String));
+            createCol(regions, "regionAssetSendKey", typeof (String));
+
+            createCol(regions, "regionUserURI", typeof (String));
+            createCol(regions, "regionUserRecvKey", typeof (String));
+            createCol(regions, "regionUserSendKey", typeof (String));
 
             // Add in contraints
-            regions.PrimaryKey = new DataColumn[] { regions.Columns["UUID"] };
+            regions.PrimaryKey = new DataColumn[] {regions.Columns["UUID"]};
             return regions;
         }
 
@@ -168,42 +169,42 @@ namespace OpenSim.Framework.Data.SQLite
             if (reader.Read())
             {
                 // Region Main
-                retval.regionHandle = (ulong)reader["regionHandle"];
-                retval.regionName = (string)reader["regionName"];
-                retval.UUID = new LLUUID((string)reader["uuid"]);
+                retval.regionHandle = (ulong) reader["regionHandle"];
+                retval.regionName = (string) reader["regionName"];
+                retval.UUID = new LLUUID((string) reader["uuid"]);
 
                 // Secrets
-                retval.regionRecvKey = (string)reader["regionRecvKey"];
-                retval.regionSecret = (string)reader["regionSecret"];
-                retval.regionSendKey = (string)reader["regionSendKey"];
+                retval.regionRecvKey = (string) reader["regionRecvKey"];
+                retval.regionSecret = (string) reader["regionSecret"];
+                retval.regionSendKey = (string) reader["regionSendKey"];
 
                 // Region Server
-                retval.regionDataURI = (string)reader["regionDataURI"];
+                retval.regionDataURI = (string) reader["regionDataURI"];
                 retval.regionOnline = false; // Needs to be pinged before this can be set.
-                retval.serverIP = (string)reader["serverIP"];
-                retval.serverPort = (uint)reader["serverPort"];
-                retval.serverURI = (string)reader["serverURI"];
+                retval.serverIP = (string) reader["serverIP"];
+                retval.serverPort = (uint) reader["serverPort"];
+                retval.serverURI = (string) reader["serverURI"];
 
                 // Location
-                retval.regionLocX = (uint)((int)reader["locX"]);
-                retval.regionLocY = (uint)((int)reader["locY"]);
-                retval.regionLocZ = (uint)((int)reader["locZ"]);
+                retval.regionLocX = (uint) ((int) reader["locX"]);
+                retval.regionLocY = (uint) ((int) reader["locY"]);
+                retval.regionLocZ = (uint) ((int) reader["locZ"]);
 
                 // Neighbours - 0 = No Override
-                retval.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];
-                retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];
-                retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];
-                retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];
+                retval.regionEastOverrideHandle = (ulong) reader["eastOverrideHandle"];
+                retval.regionWestOverrideHandle = (ulong) reader["westOverrideHandle"];
+                retval.regionSouthOverrideHandle = (ulong) reader["southOverrideHandle"];
+                retval.regionNorthOverrideHandle = (ulong) reader["northOverrideHandle"];
 
                 // Assets
-                retval.regionAssetURI = (string)reader["regionAssetURI"];
-                retval.regionAssetRecvKey = (string)reader["regionAssetRecvKey"];
-                retval.regionAssetSendKey = (string)reader["regionAssetSendKey"];
+                retval.regionAssetURI = (string) reader["regionAssetURI"];
+                retval.regionAssetRecvKey = (string) reader["regionAssetRecvKey"];
+                retval.regionAssetSendKey = (string) reader["regionAssetSendKey"];
 
                 // Userserver
-                retval.regionUserURI = (string)reader["regionUserURI"];
-                retval.regionUserRecvKey = (string)reader["regionUserRecvKey"];
-                retval.regionUserSendKey = (string)reader["regionUserSendKey"];
+                retval.regionUserURI = (string) reader["regionUserURI"];
+                retval.regionUserRecvKey = (string) reader["regionUserRecvKey"];
+                retval.regionUserSendKey = (string) reader["regionUserSendKey"];
             }
             else
             {
@@ -219,12 +220,15 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>Success?</returns>
         public bool insertRow(RegionProfileData profile)
         {
-            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
+            string sql =
+                "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
+            sql +=
+                "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
             sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
 
             sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
-            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
+            sql +=
+                "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
             sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
 
             Dictionary<string, string> parameters = new Dictionary<string, string>();
@@ -271,4 +275,4 @@ namespace OpenSim.Framework.Data.SQLite
             return returnval;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 37a8be5..d7a6b39 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -26,12 +26,8 @@
 * 
 */
 using System;
-using System.IO;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Framework;
 using System.Data;
-using System.Data.SqlTypes;
+using libsecondlife;
 using Mono.Data.SqliteClient;
 using OpenSim.Framework.Console;
 
@@ -45,30 +41,31 @@ namespace OpenSim.Framework.Data.SQLite
         /// <summary>
         /// The database manager
         /// </summary>
-
         /// <summary>
         /// Artificial constructor called upon plugin load
         /// </summary>
         private const string userSelect = "select * from users";
+
         private DataSet ds;
         private SqliteDataAdapter da;
-        
+
         public void Initialise()
         {
             SqliteConnection conn = new SqliteConnection("URI=file:userprofiles.db,version=3");
             TestTables(conn);
-            
+
             ds = new DataSet();
             da = new SqliteDataAdapter(new SqliteCommand(userSelect, conn));
 
-            lock (ds) {
+            lock (ds)
+            {
                 ds.Tables.Add(createUsersTable());
                 ds.Tables.Add(createUserAgentsTable());
-                
+
                 setupUserCommands(da, conn);
                 da.Fill(ds.Tables["users"]);
             }
-            
+
             return;
         }
 
@@ -79,16 +76,21 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A user profile</returns>
         public UserProfileData GetUserByUUID(LLUUID uuid)
         {
-            lock (ds) {
+            lock (ds)
+            {
                 DataRow row = ds.Tables["users"].Rows.Find(uuid);
-                if(row != null) {
+                if (row != null)
+                {
                     UserProfileData user = buildUserProfile(row);
                     row = ds.Tables["useragents"].Rows.Find(uuid);
-                    if(row != null) {
+                    if (row != null)
+                    {
                         user.currentAgent = buildUserAgent(row);
                     }
                     return user;
-                } else {
+                }
+                else
+                {
                     return null;
                 }
             }
@@ -113,16 +115,21 @@ namespace OpenSim.Framework.Data.SQLite
         public UserProfileData GetUserByName(string fname, string lname)
         {
             string select = "surname = '" + lname + "' and username = '" + fname + "'";
-            lock (ds) {
+            lock (ds)
+            {
                 DataRow[] rows = ds.Tables["users"].Select(select);
-                if(rows.Length > 0) {
+                if (rows.Length > 0)
+                {
                     UserProfileData user = buildUserProfile(rows[0]);
                     DataRow row = ds.Tables["useragents"].Rows.Find(user.UUID);
-                    if(row != null) {
+                    if (row != null)
+                    {
                         user.currentAgent = buildUserAgent(row);
                     }
                     return user;
-                } else {
+                }
+                else
+                {
                     return null;
                 }
             }
@@ -134,7 +141,7 @@ namespace OpenSim.Framework.Data.SQLite
         /// <param name="uuid">The users account ID</param>
         /// <returns>A matching users profile</returns>
         public UserAgentData GetAgentByUUID(LLUUID uuid)
-        {   
+        {
             try
             {
                 return GetUserByUUID(uuid).currentAgent;
@@ -165,7 +172,7 @@ namespace OpenSim.Framework.Data.SQLite
         {
             try
             {
-                return GetUserByName(fname,lname).currentAgent;
+                return GetUserByName(fname, lname).currentAgent;
             }
             catch (Exception)
             {
@@ -180,8 +187,9 @@ namespace OpenSim.Framework.Data.SQLite
         public void AddNewUserProfile(UserProfileData user)
         {
             DataTable users = ds.Tables["users"];
-            lock (ds) {
-                DataRow row = users.Rows.Find(user.UUID); 
+            lock (ds)
+            {
+                DataRow row = users.Rows.Find(user.UUID);
                 if (row == null)
                 {
                     row = users.NewRow();
@@ -192,10 +200,11 @@ namespace OpenSim.Framework.Data.SQLite
                 {
                     fillUserRow(row, user);
                 }
-                
-                if(user.currentAgent != null) {
+
+                if (user.currentAgent != null)
+                {
                     DataTable ua = ds.Tables["useragents"];
-                    row = ua.Rows.Find(user.UUID); 
+                    row = ua.Rows.Find(user.UUID);
                     if (row == null)
                     {
                         row = ua.NewRow();
@@ -207,12 +216,13 @@ namespace OpenSim.Framework.Data.SQLite
                         fillUserAgentRow(row, user.currentAgent);
                     }
                 }
-                MainLog.Instance.Verbose("SQLITE", "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
+                MainLog.Instance.Verbose("SQLITE",
+                                         "Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
                 // save changes off to disk
                 da.Update(ds, "users");
             }
         }
-      
+
         /// <summary>
         /// Creates a new user profile
         /// </summary>
@@ -220,10 +230,13 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>True on success, false on error</returns>
         public bool UpdateUserProfile(UserProfileData user)
         {
-            try {
+            try
+            {
                 AddNewUserProfile(user);
                 return true;
-            } catch (Exception) {
+            }
+            catch (Exception)
+            {
                 return false;
             }
         }
@@ -279,51 +292,51 @@ namespace OpenSim.Framework.Data.SQLite
         {
             return "0.1";
         }
-        
+
         /***********************************************************************
          *
          *  DataTable creation 
          *
          **********************************************************************/
-                /***********************************************************************
+        /***********************************************************************
          *
          *  Database Definition Functions
          * 
          *  This should be db agnostic as we define them in ADO.NET terms
          *
          **********************************************************************/
-        
+
         private DataTable createUsersTable()
         {
             DataTable users = new DataTable("users");
 
-            createCol(users, "UUID", typeof(System.String));
-            createCol(users, "username", typeof(System.String));
-            createCol(users, "surname", typeof(System.String));
-            createCol(users, "passwordHash", typeof(System.String));
-            createCol(users, "passwordSalt", typeof(System.String));
-
-            createCol(users, "homeRegionX", typeof(System.Int32));
-            createCol(users, "homeRegionY", typeof(System.Int32));
-            createCol(users, "homeLocationX", typeof(System.Double));
-            createCol(users, "homeLocationY", typeof(System.Double));
-            createCol(users, "homeLocationZ", typeof(System.Double));
-            createCol(users, "homeLookAtX", typeof(System.Double));
-            createCol(users, "homeLookAtY", typeof(System.Double));
-            createCol(users, "homeLookAtZ", typeof(System.Double));
-            createCol(users, "created", typeof(System.Int32));
-            createCol(users, "lastLogin", typeof(System.Int32));
-            createCol(users, "rootInventoryFolderID", typeof(System.String));
-            createCol(users, "userInventoryURI", typeof(System.String));
-            createCol(users, "userAssetURI", typeof(System.String));
-            createCol(users, "profileCanDoMask", typeof(System.Int32));
-            createCol(users, "profileWantDoMask", typeof(System.Int32));
-            createCol(users, "profileAboutText", typeof(System.String));
-            createCol(users, "profileFirstText", typeof(System.String));
-            createCol(users, "profileImage", typeof(System.String));
-            createCol(users, "profileFirstImage", typeof(System.String));
+            createCol(users, "UUID", typeof (String));
+            createCol(users, "username", typeof (String));
+            createCol(users, "surname", typeof (String));
+            createCol(users, "passwordHash", typeof (String));
+            createCol(users, "passwordSalt", typeof (String));
+
+            createCol(users, "homeRegionX", typeof (Int32));
+            createCol(users, "homeRegionY", typeof (Int32));
+            createCol(users, "homeLocationX", typeof (Double));
+            createCol(users, "homeLocationY", typeof (Double));
+            createCol(users, "homeLocationZ", typeof (Double));
+            createCol(users, "homeLookAtX", typeof (Double));
+            createCol(users, "homeLookAtY", typeof (Double));
+            createCol(users, "homeLookAtZ", typeof (Double));
+            createCol(users, "created", typeof (Int32));
+            createCol(users, "lastLogin", typeof (Int32));
+            createCol(users, "rootInventoryFolderID", typeof (String));
+            createCol(users, "userInventoryURI", typeof (String));
+            createCol(users, "userAssetURI", typeof (String));
+            createCol(users, "profileCanDoMask", typeof (Int32));
+            createCol(users, "profileWantDoMask", typeof (Int32));
+            createCol(users, "profileAboutText", typeof (String));
+            createCol(users, "profileFirstText", typeof (String));
+            createCol(users, "profileImage", typeof (String));
+            createCol(users, "profileFirstImage", typeof (String));
             // Add in contraints
-            users.PrimaryKey = new DataColumn[] { users.Columns["UUID"] };
+            users.PrimaryKey = new DataColumn[] {users.Columns["UUID"]};
             return users;
         }
 
@@ -331,27 +344,27 @@ namespace OpenSim.Framework.Data.SQLite
         {
             DataTable ua = new DataTable("useragents");
             // this is the UUID of the user
-            createCol(ua, "UUID", typeof(System.String));
-            createCol(ua, "agentIP", typeof(System.String));
-            createCol(ua, "agentPort", typeof(System.Int32));
-            createCol(ua, "agentOnline", typeof(System.Boolean));
-            createCol(ua, "sessionID", typeof(System.String));
-            createCol(ua, "secureSessionID", typeof(System.String));
-            createCol(ua, "regionID", typeof(System.String));
-            createCol(ua, "loginTime", typeof(System.Int32));
-            createCol(ua, "logoutTime", typeof(System.Int32));
-            createCol(ua, "currentRegion", typeof(System.String));
-            createCol(ua, "currentHandle", typeof(System.Int32));
+            createCol(ua, "UUID", typeof (String));
+            createCol(ua, "agentIP", typeof (String));
+            createCol(ua, "agentPort", typeof (Int32));
+            createCol(ua, "agentOnline", typeof (Boolean));
+            createCol(ua, "sessionID", typeof (String));
+            createCol(ua, "secureSessionID", typeof (String));
+            createCol(ua, "regionID", typeof (String));
+            createCol(ua, "loginTime", typeof (Int32));
+            createCol(ua, "logoutTime", typeof (Int32));
+            createCol(ua, "currentRegion", typeof (String));
+            createCol(ua, "currentHandle", typeof (Int32));
             // vectors
-            createCol(ua, "currentPosX", typeof(System.Double));
-            createCol(ua, "currentPosY", typeof(System.Double));
-            createCol(ua, "currentPosZ", typeof(System.Double));
+            createCol(ua, "currentPosX", typeof (Double));
+            createCol(ua, "currentPosY", typeof (Double));
+            createCol(ua, "currentPosZ", typeof (Double));
             // constraints
-            ua.PrimaryKey = new DataColumn[] { ua.Columns["UUID"] };
+            ua.PrimaryKey = new DataColumn[] {ua.Columns["UUID"]};
 
             return ua;
         }
-        
+
         /***********************************************************************
          *  
          *  Convert between ADO.NET <=> OpenSim Objects
@@ -366,35 +379,35 @@ namespace OpenSim.Framework.Data.SQLite
             // interesting has to be done to actually get these values
             // back out.  Not enough time to figure it out yet.
             UserProfileData user = new UserProfileData();
-            user.UUID = new LLUUID((String)row["UUID"]);
-            user.username = (String)row["username"];
-            user.surname = (String)row["surname"];
-            user.passwordHash = (String)row["passwordHash"];
-            user.passwordSalt = (String)row["passwordSalt"];
+            user.UUID = new LLUUID((String) row["UUID"]);
+            user.username = (String) row["username"];
+            user.surname = (String) row["surname"];
+            user.passwordHash = (String) row["passwordHash"];
+            user.passwordSalt = (String) row["passwordSalt"];
 
             user.homeRegionX = Convert.ToUInt32(row["homeRegionX"]);
             user.homeRegionY = Convert.ToUInt32(row["homeRegionY"]);
             user.homeLocation = new LLVector3(
-                                              Convert.ToSingle(row["homeLocationX"]),
-                                              Convert.ToSingle(row["homeLocationY"]),
-                                              Convert.ToSingle(row["homeLocationZ"])
-                                              );
+                Convert.ToSingle(row["homeLocationX"]),
+                Convert.ToSingle(row["homeLocationY"]),
+                Convert.ToSingle(row["homeLocationZ"])
+                );
             user.homeLookAt = new LLVector3(
-                                            Convert.ToSingle(row["homeLookAtX"]),
-                                            Convert.ToSingle(row["homeLookAtY"]),
-                                            Convert.ToSingle(row["homeLookAtZ"])
-                                            );
+                Convert.ToSingle(row["homeLookAtX"]),
+                Convert.ToSingle(row["homeLookAtY"]),
+                Convert.ToSingle(row["homeLookAtZ"])
+                );
             user.created = Convert.ToInt32(row["created"]);
             user.lastLogin = Convert.ToInt32(row["lastLogin"]);
-            user.rootInventoryFolderID = new LLUUID((String)row["rootInventoryFolderID"]);
-            user.userInventoryURI = (String)row["userInventoryURI"];
-            user.userAssetURI = (String)row["userAssetURI"];
+            user.rootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
+            user.userInventoryURI = (String) row["userInventoryURI"];
+            user.userAssetURI = (String) row["userAssetURI"];
             user.profileCanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
             user.profileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
-            user.profileAboutText = (String)row["profileAboutText"];
-            user.profileFirstText = (String)row["profileFirstText"];
-            user.profileImage = new LLUUID((String)row["profileImage"]);
-            user.profileFirstImage = new LLUUID((String)row["profileFirstImage"]);
+            user.profileAboutText = (String) row["profileAboutText"];
+            user.profileFirstText = (String) row["profileFirstText"];
+            user.profileImage = new LLUUID((String) row["profileImage"]);
+            user.profileFirstImage = new LLUUID((String) row["profileFirstImage"]);
             return user;
         }
 
@@ -405,8 +418,8 @@ namespace OpenSim.Framework.Data.SQLite
             row["surname"] = user.surname;
             row["passwordHash"] = user.passwordHash;
             row["passwordSalt"] = user.passwordSalt;
-            
-            
+
+
             row["homeRegionX"] = user.homeRegionX;
             row["homeRegionY"] = user.homeRegionY;
             row["homeLocationX"] = user.homeLocation.X;
@@ -427,10 +440,12 @@ namespace OpenSim.Framework.Data.SQLite
             row["profileFirstText"] = user.profileFirstText;
             row["profileImage"] = user.profileImage;
             row["profileFirstImage"] = user.profileFirstImage;
-            
+
             // ADO.NET doesn't handle NULL very well
-            foreach (DataColumn col in ds.Tables["users"].Columns) {
-                if (row[col] == null) {
+            foreach (DataColumn col in ds.Tables["users"].Columns)
+            {
+                if (row[col] == null)
+                {
                     row[col] = "";
                 }
             }
@@ -439,33 +454,33 @@ namespace OpenSim.Framework.Data.SQLite
         private UserAgentData buildUserAgent(DataRow row)
         {
             UserAgentData ua = new UserAgentData();
-            
-            ua.UUID = new LLUUID((String)row["UUID"]);
-            ua.agentIP = (String)row["agentIP"];
+
+            ua.UUID = new LLUUID((String) row["UUID"]);
+            ua.agentIP = (String) row["agentIP"];
             ua.agentPort = Convert.ToUInt32(row["agentPort"]);
             ua.agentOnline = Convert.ToBoolean(row["agentOnline"]);
-            ua.sessionID = new LLUUID((String)row["sessionID"]);
-            ua.secureSessionID = new LLUUID((String)row["secureSessionID"]);
-            ua.regionID = new LLUUID((String)row["regionID"]);
+            ua.sessionID = new LLUUID((String) row["sessionID"]);
+            ua.secureSessionID = new LLUUID((String) row["secureSessionID"]);
+            ua.regionID = new LLUUID((String) row["regionID"]);
             ua.loginTime = Convert.ToInt32(row["loginTime"]);
             ua.logoutTime = Convert.ToInt32(row["logoutTime"]);
-            ua.currentRegion = new LLUUID((String)row["currentRegion"]);
+            ua.currentRegion = new LLUUID((String) row["currentRegion"]);
             ua.currentHandle = Convert.ToUInt32(row["currentHandle"]);
             ua.currentPos = new LLVector3(
-                                            Convert.ToSingle(row["currentPosX"]),
-                                            Convert.ToSingle(row["currentPosY"]),
-                                            Convert.ToSingle(row["currentPosZ"])
-                                            );
+                Convert.ToSingle(row["currentPosX"]),
+                Convert.ToSingle(row["currentPosY"]),
+                Convert.ToSingle(row["currentPosZ"])
+                );
             return ua;
         }
 
         private void fillUserAgentRow(DataRow row, UserAgentData ua)
         {
             row["UUID"] = ua.UUID;
-            row["agentIP"] =  ua.agentIP;
-            row["agentPort"] =  ua.agentPort;
-            row["agentOnline"] =  ua.agentOnline;
-            row["sessionID"] =  ua.sessionID;
+            row["agentIP"] = ua.agentIP;
+            row["agentPort"] = ua.agentPort;
+            row["agentOnline"] = ua.agentOnline;
+            row["sessionID"] = ua.sessionID;
             row["secureSessionID"] = ua.secureSessionID;
             row["regionID"] = ua.regionID;
             row["loginTime"] = ua.loginTime;
@@ -496,18 +511,18 @@ namespace OpenSim.Framework.Data.SQLite
             da.UpdateCommand.Connection = conn;
 
             SqliteCommand delete = new SqliteCommand("delete from users where UUID = :UUID");
-            delete.Parameters.Add(createSqliteParameter("UUID", typeof(System.String)));
+            delete.Parameters.Add(createSqliteParameter("UUID", typeof (String)));
             delete.Connection = conn;
             da.DeleteCommand = delete;
         }
-        
+
         private void InitDB(SqliteConnection conn)
         {
             string createUsers = defineTable(createUsersTable());
             SqliteCommand pcmd = new SqliteCommand(createUsers, conn);
             conn.Open();
             pcmd.ExecuteNonQuery();
-            conn.Close(); 
+            conn.Close();
         }
 
         private bool TestTables(SqliteConnection conn)
@@ -515,14 +530,16 @@ namespace OpenSim.Framework.Data.SQLite
             SqliteCommand cmd = new SqliteCommand(userSelect, conn);
             SqliteDataAdapter pDa = new SqliteDataAdapter(cmd);
             DataSet tmpDS = new DataSet();
-            try {
+            try
+            {
                 pDa.Fill(tmpDS, "users");
-            } catch (Mono.Data.SqliteClient.SqliteSyntaxException) {
+            }
+            catch (SqliteSyntaxException)
+            {
                 MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating");
                 InitDB(conn);
             }
             return true;
         }
-
     }
-}
+}
\ No newline at end of file