11 files changed, 732 insertions, 128 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c52f60b..373c903 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -30,7 +30,7 @@ using System.Data;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 
@@ -339,4 +339,4 @@ namespace OpenSim.Data.SQLite
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
new file mode 100644
index 0000000..086ac0a
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.Sqlite;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames;
+        private int m_LastExpire;
+        private string m_connectionString;
+
+        protected static SqliteConnection m_Connection;
+        private static bool m_initialized = false;
+
+        public SQLiteAuthenticationData(string connectionString, string realm)
+                : base(connectionString)
+        {
+            m_Realm = realm;
+            m_connectionString = connectionString;
+
+            if (!m_initialized)
+            {
+                m_Connection = new SqliteConnection(connectionString);
+                m_Connection.Open();
+
+                Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
+                m.Update();
+
+                m_initialized = true;
+            }
+        }
+
+        public AuthenticationData Get(UUID principalID)
+        {
+            AuthenticationData ret = new AuthenticationData();
+            ret.Data = new Dictionary<string, object>();
+
+            SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID");
+            cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
+
+            IDataReader result = ExecuteReader(cmd, m_Connection);
+
+            try
+            {
+                if (result.Read())
+                {
+                    ret.PrincipalID = principalID;
+
+                    if (m_ColumnNames == null)
+                    {
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                    }
+
+                    foreach (string s in m_ColumnNames)
+                    {
+                        if (s == "UUID")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
+                    }
+
+                    return ret;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch
+            {
+            }
+            finally
+            {
+                //CloseCommand(cmd);
+            }
+
+            return null;
+        }
+
+        public bool Store(AuthenticationData data)
+        {
+            if (data.Data.ContainsKey("UUID"))
+                data.Data.Remove("UUID");
+
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+            string[] values = new string[data.Data.Count];
+            int i = 0;
+            foreach (object o in data.Data.Values)
+                values[i++] = o.ToString();
+
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (Get(data.PrincipalID) != null)
+            {
+
+
+                string update = "update `" + m_Realm + "` set ";
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        update += ", ";
+                    update += "`" + field + "` = :" + field;
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
+
+                    first = false;
+                }
+
+                update += " where UUID = :UUID";
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+
+                cmd.CommandText = update;
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
+                    {
+                        //CloseCommand(cmd);
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    //CloseCommand(cmd);
+                    return false;
+                }
+            }
+
+            else
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (:UUID, :" + String.Join(", :", fields) + ")";
+
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+                foreach (string field in fields)
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
+
+                cmd.CommandText = insert;
+
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
+                    {
+                        //CloseCommand(cmd);
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    //CloseCommand(cmd);
+                    return false;
+                }
+            }
+
+            //CloseCommand(cmd);
+
+            return true;
+        }
+
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
+                    "` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                return true;
+
+            return false;
+        }
+
+        public bool SetToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
+                "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+            {
+                cmd.Dispose();
+                return true;
+            }
+
+            cmd.Dispose();
+            return false;
+        }
+
+        public bool CheckToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
+                " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+            {
+                cmd.Dispose();
+                return true;
+            }
+
+            cmd.Dispose();
+
+            return false;
+        }
+
+        private void DoExpire()
+        {
+            SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')");
+            ExecuteNonQuery(cmd, m_Connection);
+
+            cmd.Dispose();
+
+            m_LastExpire = System.Environment.TickCount;
+        }
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 1be99ee..ad4e2a2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -62,8 +62,8 @@ namespace OpenSim.Data.SQLite
             Migration m = new Migration(m_connection, assem, "EstateStore");
             m.Update();
 
-            m_connection.Close();
-            m_connection.Open();
+            //m_connection.Close();
+           // m_connection.Open();
 
             Type t = typeof(EstateSettings);
             m_Fields = t.GetFields(BindingFlags.NonPublic |
@@ -90,7 +90,7 @@ namespace OpenSim.Data.SQLite
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
             cmd.CommandText = sql;
-            cmd.Parameters.Add(":RegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
 
             IDataReader r = cmd.ExecuteReader();
 
@@ -140,13 +140,13 @@ namespace OpenSim.Data.SQLite
                     if (m_FieldMap[name].GetValue(es) is bool)
                     {
                         if ((bool)m_FieldMap[name].GetValue(es))
-                            cmd.Parameters.Add(":"+name, "1");
+                            cmd.Parameters.AddWithValue(":"+name, "1");
                         else
-                            cmd.Parameters.Add(":"+name, "0");
+                            cmd.Parameters.AddWithValue(":"+name, "0");
                     }
                     else
                     {
-                        cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
+                        cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
                     }
                 }
 
@@ -164,8 +164,8 @@ namespace OpenSim.Data.SQLite
                 r.Close();
 
                 cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
-                cmd.Parameters.Add(":RegionID", regionID.ToString());
-                cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
+                cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+                cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
 
                 // This will throw on dupe key
                 try
@@ -222,13 +222,13 @@ namespace OpenSim.Data.SQLite
                 if (m_FieldMap[name].GetValue(es) is bool)
                 {
                     if ((bool)m_FieldMap[name].GetValue(es))
-                        cmd.Parameters.Add(":"+name, "1");
+                        cmd.Parameters.AddWithValue(":"+name, "1");
                     else
-                        cmd.Parameters.Add(":"+name, "0");
+                        cmd.Parameters.AddWithValue(":"+name, "0");
                 }
                 else
                 {
-                    cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
+                    cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
                 }
             }
 
@@ -247,7 +247,7 @@ namespace OpenSim.Data.SQLite
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
             cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
-            cmd.Parameters.Add(":EstateID", es.EstateID);
+            cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
 
             IDataReader r = cmd.ExecuteReader();
 
@@ -271,7 +271,7 @@ namespace OpenSim.Data.SQLite
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
             cmd.CommandText = "delete from estateban where EstateID = :EstateID";
-            cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
+            cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
 
             cmd.ExecuteNonQuery();
 
@@ -281,8 +281,8 @@ namespace OpenSim.Data.SQLite
 
             foreach (EstateBan b in es.EstateBans)
             {
-                cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
-                cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString());
+                cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
+                cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());
 
                 cmd.ExecuteNonQuery();
                 cmd.Parameters.Clear();
@@ -294,7 +294,7 @@ namespace OpenSim.Data.SQLite
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
             cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
-            cmd.Parameters.Add(":EstateID", EstateID.ToString());
+            cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
 
             cmd.ExecuteNonQuery();
 
@@ -304,8 +304,8 @@ namespace OpenSim.Data.SQLite
 
             foreach (UUID uuid in data)
             {
-                cmd.Parameters.Add(":EstateID", EstateID.ToString());
-                cmd.Parameters.Add(":uuid", uuid.ToString());
+                cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
+                cmd.Parameters.AddWithValue(":uuid", uuid.ToString());
 
                 cmd.ExecuteNonQuery();
                 cmd.Parameters.Clear();
@@ -319,7 +319,7 @@ namespace OpenSim.Data.SQLite
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
 
             cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
-            cmd.Parameters.Add(":EstateID", EstateID);
+            cmd.Parameters.AddWithValue(":EstateID", EstateID);
 
             IDataReader r = cmd.ExecuteReader();
 
@@ -336,5 +336,66 @@ namespace OpenSim.Data.SQLite
 
             return uuids.ToArray();
         }
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteEstateData.cs
+=======
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID";
+
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
+
+            return DoLoad(cmd, UUID.Zero, false);
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            List<int> result = new List<int>();
+
+            string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName";
+
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = sql;
+            cmd.Parameters.AddWithValue(":EstateName", search);
+
+            IDataReader r = cmd.ExecuteReader();
+
+            while (r.Read())
+            {
+                result.Add(Convert.ToInt32(r["EstateID"]));
+            }
+            r.Close();
+
+            return result;
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
+            cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
+
+            if (cmd.ExecuteNonQuery() == 0)
+                return false;
+
+            return true;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            return new List<UUID>();
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            return false;
+        }
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteEstateData.cs
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..79eaab3 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 
 namespace OpenSim.Data.SQLite
 {
@@ -57,7 +57,19 @@ namespace OpenSim.Data.SQLite
         {
             lock (m_Connection)
             {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
                 cmd.Connection = m_Connection;
+=======
+/*
+                SqliteConnection newConnection =
+                        (SqliteConnection)((ICloneable)connection).Clone();
+                newConnection.Open();
+
+                cmd.Connection = newConnection;
+*/
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
 
                 return cmd.ExecuteNonQuery();
             }
@@ -65,12 +77,27 @@ namespace OpenSim.Data.SQLite
         
         protected IDataReader ExecuteReader(SqliteCommand cmd)
         {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
             SqliteConnection newConnection =
                     (SqliteConnection)((ICloneable)m_Connection).Clone();
             newConnection.Open();
 
             cmd.Connection = newConnection;
             return cmd.ExecuteReader();
+=======
+            lock (connection)
+            {
+                //SqliteConnection newConnection =
+                //        (SqliteConnection)((ICloneable)connection).Clone();
+                //newConnection.Open();
+
+                //cmd.Connection = newConnection;
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+
+                return cmd.ExecuteReader();
+            }
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
         }
 
         protected void CloseReaderCommand(SqliteCommand cmd)
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
new file mode 100644
index 0000000..b06853c
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.Sqlite;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public SQLiteFriendsData(string connectionString, string realm)
+            : base(connectionString, realm, "FriendsStore")
+        {
+        }
+
+        public FriendsData[] GetFriends(UUID userID)
+        {
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue(":PrincipalID", userID.ToString());
+
+            return DoQuery(cmd);
+
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
+            cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue(":Friend", friend);
+
+            ExecuteNonQuery(cmd, cmd.Connection);
+
+            return true;
+        }
+
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 8e91693..918cb3d 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -54,7 +54,27 @@ namespace OpenSim.Data.SQLite
             m_Realm = realm;
             if (storeName != String.Empty)
             {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
                 Assembly assem = GetType().Assembly;
+=======
+                m_Connection = new SqliteConnection(connectionString);
+                Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
+                m_Connection.Open();
+
+                if (storeName != String.Empty)
+                {
+                    Assembly assem = GetType().Assembly;
+                    //SqliteConnection newConnection =
+                    //        (SqliteConnection)((ICloneable)m_Connection).Clone();
+                    //newConnection.Open();
+
+                    //Migration m = new Migration(newConnection, assem, storeName);
+                    Migration m = new Migration(m_Connection, assem, storeName);
+                    m.Update();
+                    //newConnection.Close();
+                    //newConnection.Dispose();
+                }
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
 
                 Migration m = new Migration(m_Connection, assem, storeName);
                 m.Update();
@@ -180,7 +200,11 @@ namespace OpenSim.Data.SQLite
                 result.Add(row);
             }
 
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
             CloseReaderCommand(cmd);
+=======
+            //CloseCommand(cmd);
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
 
             return result.ToArray();
         }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 64591fd..0149838 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 
@@ -89,6 +89,7 @@ namespace OpenSim.Data.SQLite
 
             ds = new DataSet();
 
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteInventoryStore.cs
             ds.Tables.Add(createInventoryFoldersTable());
             invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
             setupFoldersCommands(invFoldersDa, conn);
@@ -98,6 +99,19 @@ namespace OpenSim.Data.SQLite
             invItemsDa.Fill(ds.Tables["inventoryitems"]);
             setupItemsCommands(invItemsDa, conn);
             m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
+=======
+                ds.Tables.Add(createInventoryFoldersTable());
+                invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
+                setupFoldersCommands(invFoldersDa, conn);
+                CreateDataSetMapping(invFoldersDa, "inventoryfolders");
+                m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
+
+                ds.Tables.Add(createInventoryItemsTable());
+                invItemsDa.Fill(ds.Tables["inventoryitems"]);
+                setupItemsCommands(invItemsDa, conn);
+                CreateDataSetMapping(invItemsDa, "inventoryitems");
+                m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteInventoryStore.cs
 
             ds.AcceptChanges();
         }
@@ -721,6 +735,15 @@ namespace OpenSim.Data.SQLite
          *
          **********************************************************************/
 
+        protected void CreateDataSetMapping(IDataAdapter da, string tableName)
+        {       
+            ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
+            foreach (DataColumn col in ds.Tables[tableName].Columns)
+            {       
+                dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+            }       
+        }
+
         /// <summary>
         /// Create the "inventoryitems" table
         /// </summary>
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 5a4ee2a..85368ab 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -32,7 +32,7 @@ using System.Drawing;
 using System.IO;
 using System.Reflection;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -87,119 +87,142 @@ namespace OpenSim.Data.SQLite
         /// <param name="connectionString">the connection string</param>
         public void Initialise(string connectionString)
         {
-            m_connectionString = connectionString;
+            try
+            {
+                m_connectionString = connectionString;
 
-            ds = new DataSet();
+                ds = new DataSet("Region");
 
-            m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
-            m_conn = new SqliteConnection(m_connectionString);
-            m_conn.Open();
+                m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
+                m_conn = new SqliteConnection(m_connectionString);
+                m_conn.Open();
 
+                SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
+                primDa = new SqliteDataAdapter(primSelectCmd);
 
+                SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
+                shapeDa = new SqliteDataAdapter(shapeSelectCmd);
+                // SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
 
-            SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
-            primDa = new SqliteDataAdapter(primSelectCmd);
-            //            SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
+                SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
+                itemsDa = new SqliteDataAdapter(itemsSelectCmd);
 
-            SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
-            shapeDa = new SqliteDataAdapter(shapeSelectCmd);
-            // SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
+                SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
+                terrainDa = new SqliteDataAdapter(terrainSelectCmd);
 
-            SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
-            itemsDa = new SqliteDataAdapter(itemsSelectCmd);
+                SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
+                landDa = new SqliteDataAdapter(landSelectCmd);
 
-            SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
-            terrainDa = new SqliteDataAdapter(terrainSelectCmd);
+                SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
+                landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
 
-            SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
-            landDa = new SqliteDataAdapter(landSelectCmd);
+                SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
+                regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
+                // This actually does the roll forward assembly stuff
+                Assembly assem = GetType().Assembly;
+                Migration m = new Migration(m_conn, assem, "RegionStore");
+                m.Update();
 
-            SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
-            landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
+                lock (ds)
+                {
+                    ds.Tables.Add(createPrimTable());
+                    setupPrimCommands(primDa, m_conn);
 
-            SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
-            regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
-            Migration m = new Migration(m_conn, assem, "RegionStore");
-            m.Update();
+                    ds.Tables.Add(createShapeTable());
+                    setupShapeCommands(shapeDa, m_conn);
 
-            lock (ds)
-            {
-                ds.Tables.Add(createPrimTable());
-                setupPrimCommands(primDa, m_conn);
-                primDa.Fill(ds.Tables["prims"]);
+                    ds.Tables.Add(createItemsTable());
+                    setupItemsCommands(itemsDa, m_conn);
 
-                ds.Tables.Add(createShapeTable());
-                setupShapeCommands(shapeDa, m_conn);
+                    ds.Tables.Add(createTerrainTable());
+                    setupTerrainCommands(terrainDa, m_conn);
 
-                ds.Tables.Add(createItemsTable());
-                setupItemsCommands(itemsDa, m_conn);
-                itemsDa.Fill(ds.Tables["primitems"]);
+                    ds.Tables.Add(createLandTable());
+                    setupLandCommands(landDa, m_conn);
 
-                ds.Tables.Add(createTerrainTable());
-                setupTerrainCommands(terrainDa, m_conn);
+                    ds.Tables.Add(createLandAccessListTable());
+                    setupLandAccessCommands(landAccessListDa, m_conn);
 
-                ds.Tables.Add(createLandTable());
-                setupLandCommands(landDa, m_conn);
+                    ds.Tables.Add(createRegionSettingsTable());
+                    setupRegionSettingsCommands(regionSettingsDa, m_conn);
 
-                ds.Tables.Add(createLandAccessListTable());
-                setupLandAccessCommands(landAccessListDa, m_conn);
+                    // WORKAROUND: This is a work around for sqlite on
+                    // windows, which gets really unhappy with blob columns
+                    // that have no sample data in them.  At some point we
+                    // need to actually find a proper way to handle this.
+                    try
+                    {
+                        primDa.Fill(ds.Tables["prims"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on prims table");
+                    }
 
-                ds.Tables.Add(createRegionSettingsTable());
-                
-                setupRegionSettingsCommands(regionSettingsDa, m_conn);
+                    try
+                    {
+                        shapeDa.Fill(ds.Tables["primshapes"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on primshapes table");
+                    }
 
-                // WORKAROUND: This is a work around for sqlite on
-                // windows, which gets really unhappy with blob columns
-                // that have no sample data in them.  At some point we
-                // need to actually find a proper way to handle this.
-                try
-                {
-                    shapeDa.Fill(ds.Tables["primshapes"]);
-                }
-                catch (Exception)
-                {
-                    m_log.Info("[REGION DB]: Caught fill error on primshapes table");
-                }
+                    try
+                    {
+                        terrainDa.Fill(ds.Tables["terrain"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on terrain table");
+                    }
 
-                try
-                {
-                    terrainDa.Fill(ds.Tables["terrain"]);
-                }
-                catch (Exception)
-                {
-                    m_log.Info("[REGION DB]: Caught fill error on terrain table");
-                }
+                    try
+                    {
+                        landDa.Fill(ds.Tables["land"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on land table");
+                    }
 
-                try
-                {
-                    landDa.Fill(ds.Tables["land"]);
-                }
-                catch (Exception)
-                {
-                    m_log.Info("[REGION DB]: Caught fill error on land table");
-                }
+                    try
+                    {
+                        landAccessListDa.Fill(ds.Tables["landaccesslist"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
+                    }
 
-                try
-                {
-                    landAccessListDa.Fill(ds.Tables["landaccesslist"]);
-                }
-                catch (Exception)
-                {
-                    m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
-                }
+                    try
+                    {
+                        regionSettingsDa.Fill(ds.Tables["regionsettings"]);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
+                    }
 
-                try
-                {
-                    regionSettingsDa.Fill(ds.Tables["regionsettings"]);
-                }
-                catch (Exception)
-                {
-                    m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
+                    // We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
+                    // Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409
+                    // Possibly because we manually set up our own DataTables before connecting to the database
+                    CreateDataSetMapping(primDa, "prims");
+                    CreateDataSetMapping(shapeDa, "primshapes");
+                    CreateDataSetMapping(itemsDa, "primitems");
+                    CreateDataSetMapping(terrainDa, "terrain");
+                    CreateDataSetMapping(landDa, "land");
+                    CreateDataSetMapping(landAccessListDa, "landaccesslist");
+                    CreateDataSetMapping(regionSettingsDa, "regionsettings");
                 }
-                return;
             }
+            catch (Exception e)
+            {
+              m_log.Error(e);
+              Environment.Exit(23);
+            }
+
+            return;
         }
 
         public void Dispose()
@@ -594,7 +617,7 @@ namespace OpenSim.Data.SQLite
                                     }
                                 }
                             }
-                            rev = (int) row["Revision"];
+                            rev = Convert.ToInt32(row["Revision"]);
                         }
                         else
                         {
@@ -746,6 +769,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         public void Commit()
         {
+            m_log.Debug("[SQLITE]: Starting commit");
             lock (ds)
             {
                 primDa.Update(ds, "prims");
@@ -760,18 +784,11 @@ namespace OpenSim.Data.SQLite
                 {
                     regionSettingsDa.Update(ds, "regionsettings");
                 } 
-                catch (SqliteExecutionException SqlEx)
+                catch (SqliteException SqlEx)
                 {
-                  if (SqlEx.Message.Contains("logic error"))
-                  {
-                      throw new Exception(
-                          "There was a SQL error or connection string configuration error when saving the region settings.  This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder.  This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set.  If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
-                          SqlEx);
-                  }
-                  else
-                  {
-                      throw SqlEx;
-                  }
+                    throw new Exception(
+                        "There was a SQL error or connection string configuration error when saving the region settings.  This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder.  This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set.  If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
+                        SqlEx);
                 }
                 ds.AcceptChanges();
             }
@@ -793,6 +810,15 @@ namespace OpenSim.Data.SQLite
          *
          **********************************************************************/
 
+        protected void CreateDataSetMapping(IDataAdapter da, string tableName)
+        {
+            ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
+            foreach (DataColumn col in ds.Tables[tableName].Columns)
+            {
+                dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
+            }
+        }
+
         /// <summary>
         ///
         /// </summary>
@@ -1955,6 +1981,7 @@ namespace OpenSim.Data.SQLite
             sql += ") values (:";
             sql += String.Join(", :", cols);
             sql += ")";
+            m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
             SqliteCommand cmd = new SqliteCommand(sql);
 
             // this provides the binding for all our parameters, so
@@ -2250,6 +2277,36 @@ namespace OpenSim.Data.SQLite
                 return DbType.String;
             }
         }
+        
+        static void PrintDataSet(DataSet ds)
+        {
+          // Print out any name and extended properties.
+          Console.WriteLine("DataSet is named: {0}", ds.DataSetName);
+          foreach (System.Collections.DictionaryEntry de in ds.ExtendedProperties)
+          {
+            Console.WriteLine("Key = {0}, Value = {1}", de.Key, de.Value);
+          }
+          Console.WriteLine();
+          foreach (DataTable dt in ds.Tables)
+          {
+            Console.WriteLine("=> {0} Table:", dt.TableName);
+            // Print out the column names.
+            for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
+            {
+              Console.Write(dt.Columns[curCol].ColumnName + "\t");
+            }
+            Console.WriteLine("\n----------------------------------");
+            // Print the DataTable.
+            for (int curRow = 0; curRow < dt.Rows.Count; curRow++)
+            {
+              for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
+              {
+                Console.Write(dt.Rows[curRow][curCol].ToString() + "\t");
+              }
+              Console.WriteLine();
+            }
+          }
+        }
 
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
new file mode 100644
index 0000000..893f105
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.Sqlite;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData
+    {
+        public SQLiteUserAccountData(string connectionString, string realm)
+                : base(connectionString, realm, "UserAccount")
+        {
+        }
+
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
+        {
+            string[] words = query.Split(new char[] {' '});
+
+            for (int i = 0 ; i < words.Length ; i++)
+            {
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
+            }
+
+            if (words.Length == 0)
+                return new UserAccountData[0];
+
+            if (words.Length > 2)
+                return new UserAccountData[0];
+
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (words.Length == 1)
+            {
+                cmd.CommandText = String.Format("select * from {0} where ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
+                    m_Realm, scopeID.ToString(), words[0]);
+            }
+            else
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    m_Realm, scopeID.ToString(), words[0], words[1]);
+            }
+
+            return DoQuery(cmd);
+        }
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index 4a835ce..07c6b69 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -27,7 +27,7 @@
 
 using System;
 using System.Data;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 
 namespace OpenSim.Data.SQLite
 {
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 5c93f88..0650a86 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -29,7 +29,7 @@ using System;
 using System.Data;
 using System.Reflection;
 using System.Collections.Generic;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -147,7 +147,11 @@ namespace OpenSim.Data.SQLite
             }
 
             reader.Close();
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteXInventoryData.cs
             CloseReaderCommand(cmd);
+=======
+            //CloseCommand(cmd);
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteXInventoryData.cs
 
             return perms;
         }