* Optimized usings

* shortened references
* Removed redundant 'this'
* Normalized EOF

6 files changed, 31 insertions, 30 deletions

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
index 3723343..462c433 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
@@ -313,4 +313,4 @@ namespace OpenSim.Framework.Data.SQLite
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
index d9aaa97..2e8d341 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs
@@ -263,4 +263,4 @@ namespace OpenSim.Framework.Data.SQLite
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index dddc085..4b790c3 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -130,16 +130,17 @@ namespace OpenSim.Framework.Data.SQLite
 
             return row;
         }
+
         /// <summary>
         /// // Returns a list of avatar and UUIDs that match the query
         /// </summary>
-        
         public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
             //Do nothing yet
             List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
             return returnlist;
         }
+
         /// <summary>
         /// Adds a new specified region to the database
         /// </summary>
@@ -201,4 +202,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 c696259..64a27f0 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -159,6 +159,7 @@ namespace OpenSim.Framework.Data.SQLite
 
             invFoldersDa.Update(ds, "inventoryfolders");
         }
+
         private void addItem(InventoryItemBase item)
         {
             DataTable inventoryItemTable = ds.Tables["inventoryitems"];
@@ -248,7 +249,8 @@ namespace OpenSim.Framework.Data.SQLite
         {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-            string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" + Util.ToRawUuidString(LLUUID.Zero) + "'";
+            string selectExp = "agentID = '" + Util.ToRawUuidString(user) + "' AND parentID = '" +
+                               Util.ToRawUuidString(LLUUID.Zero) + "'";
             DataRow[] rows = inventoryFolderTable.Select(selectExp);
             foreach (DataRow row in rows)
             {
@@ -627,4 +629,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 cac37d4..a97b146 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -275,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 811e0fa..a719fa2 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Data;
 using libsecondlife;
 using Mono.Data.SqliteClient;
-using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework.Data.SQLite
@@ -38,7 +37,6 @@ namespace OpenSim.Framework.Data.SQLite
     /// <summary>
     /// A User storage interface for the SQLite database system
     /// </summary>
-
     public class SQLiteUserData : SQLiteBase, IUserData
     {
         /// <summary>
@@ -119,46 +117,46 @@ namespace OpenSim.Framework.Data.SQLite
             }
         }
 
-        public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
+        public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
         {
-            List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
+            List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>();
             string[] querysplit;
             querysplit = query.Split(' ');
-            if (querysplit.Length == 2) 
+            if (querysplit.Length == 2)
             {
                 string select = "username like '" + querysplit[0] + "%' and surname like '" + querysplit[1] + "%'";
-                lock(ds)
+                lock (ds)
                 {
                     DataRow[] rows = ds.Tables["users"].Select(select);
-                    if (rows.Length > 0) 
+                    if (rows.Length > 0)
                     {
                         for (int i = 0; i < rows.Length; i++)
                         {
-                            OpenSim.Framework.AvatarPickerAvatar user = new OpenSim.Framework.AvatarPickerAvatar();
+                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
                             DataRow row = rows[i];
-                            user.AvatarID = new LLUUID((string)row["UUID"]);
-                            user.firstName = (string)row["username"];
-                            user.lastName = (string)row["surname"];
+                            user.AvatarID = new LLUUID((string) row["UUID"]);
+                            user.firstName = (string) row["username"];
+                            user.lastName = (string) row["surname"];
                             returnlist.Add(user);
                         }
                     }
                 }
-            } 
-            else if (querysplit.Length == 1)  
+            }
+            else if (querysplit.Length == 1)
             {
-
                 string select = "username like '" + querysplit[0] + "%' OR surname like '" + querysplit[0] + "%'";
-                lock(ds)
+                lock (ds)
                 {
                     DataRow[] rows = ds.Tables["users"].Select(select);
-                    if (rows.Length > 0) 
+                    if (rows.Length > 0)
                     {
-                        for (int i = 0;i<rows.Length;i++) {
-                            OpenSim.Framework.AvatarPickerAvatar user = new OpenSim.Framework.AvatarPickerAvatar();
+                        for (int i = 0; i < rows.Length; i++)
+                        {
+                            Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
                             DataRow row = rows[i];
-                            user.AvatarID = new LLUUID((string)row[0]);
-                            user.firstName = (string)row[1];
-                            user.lastName = (string)row[2];
+                            user.AvatarID = new LLUUID((string) row[0]);
+                            user.firstName = (string) row[1];
+                            user.lastName = (string) row[2];
                             returnlist.Add(user);
                         }
                     }
@@ -166,6 +164,7 @@ namespace OpenSim.Framework.Data.SQLite
             }
             return returnlist;
         }
+
         /// <summary>
         /// Returns a user by UUID direct
         /// </summary>
@@ -263,7 +262,6 @@ namespace OpenSim.Framework.Data.SQLite
                     }
                     else
                     {
-                       
                         row.Delete();
                         ua.AcceptChanges();
                     }
@@ -595,4 +593,4 @@ namespace OpenSim.Framework.Data.SQLite
             return true;
         }
     }
-}
+}
\ No newline at end of file