PostgreSQL dll binarie and RegionStore.migrations.sql conversion

PostgreSQL data access implementation
Merge remote-tracking branch 'upstream/master'
2013-09-15 22:31:09 -03:00 · 2013-09-15 22:16:14 -03:00 · 2013-09-13 20:41:14 -03:00 · 2013-07-04 17:52:43 -03:00 · 2013-07-04 14:59:26 -03:00 · 2013-07-04 14:55:49 -03:00
59 changed files with 26578 additions and 12334 deletions
--- a/OpenSim/Data/PGSQL/PGSQLAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -0,0 +1,291 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using System.Collections.Generic;
+using OpenMetaverse;
+using log4net;
+using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Asset server
+    /// </summary>
+    public class PGSQLAssetData : AssetDataBase
+    {
+        private const string _migrationStore = "AssetStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private long m_ticksToEpoch;
+        /// <summary>
+        /// Database manager
+        /// </summary>
+        private PGSQLManager m_database;
+        private string m_connectionString;
+
+        #region IPlugin Members
+
+        override public void Dispose() { }
+
+        /// <summary>
+        /// <para>Initialises asset interface</para>
+        /// </summary>
+        // [Obsolete("Cannot be default-initialized!")]
+        override public void Initialise()
+        {
+            m_log.Info("[PGSQLAssetData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        /// <summary>
+        /// Initialises asset interface
+        /// </summary>
+        /// <para>
+        /// a string instead of file, if someone writes the support
+        /// </para>
+        /// <param name="connectionString">connect string</param>
+        override public void Initialise(string connectionString)
+        {
+            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
+
+            m_database = new PGSQLManager(connectionString);
+            m_connectionString = connectionString;
+
+            //New migration to check for DB changes
+            m_database.CheckMigration(_migrationStore);
+        }
+
+        /// <summary>
+        /// Database provider version.
+        /// </summary>
+        override public string Version
+        {
+            get { return m_database.getVersion(); }
+        }
+
+        /// <summary>
+        /// The name of this DB provider.
+        /// </summary>
+        override public string Name
+        {
+            get { return "PGSQL Asset storage engine"; }
+        }
+
+        #endregion
+
+        #region IAssetDataPlugin Members
+
+        /// <summary>
+        /// Fetch Asset from m_database
+        /// </summary>
+        /// <param name="assetID">the asset UUID</param>
+        /// <returns></returns>
+        override public AssetBase GetAsset(UUID assetID)
+        {
+            string sql = "SELECT * FROM assets WHERE id = :id";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        AssetBase asset = new AssetBase(
+                            DBGuid.FromDB(reader["id"]),
+                            (string)reader["name"],
+                            Convert.ToSByte(reader["assetType"]),
+                            reader["creatorid"].ToString()
+                        );
+                        // Region Main
+                        asset.Description = (string)reader["description"];
+                        asset.Local = Convert.ToBoolean(reader["local"]);
+                        asset.Temporary = Convert.ToBoolean(reader["temporary"]);
+                        asset.Flags = (AssetFlags)(Convert.ToInt32(reader["asset_flags"]));
+                        asset.Data = (byte[])reader["data"];
+                        return asset;
+                    }
+                    return null; // throw new Exception("No rows to return");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create asset in m_database
+        /// </summary>
+        /// <param name="asset">the asset</param>
+        override public void StoreAsset(AssetBase asset)
+        {
+           
+            string sql =
+                @"UPDATE assets set name = :name, description = :description, assetType = :assetType,
+                         local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
+                    WHERE id=:id;
+
+                  INSERT INTO assets
+                    (id, name, description, assetType, local, 
+                     temporary, create_time, access_time, creatorid, asset_flags, data)
+                  Select :id, :name, :description, :assetType, :local, 
+                         :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
+                ";
+            
+            string assetName = asset.Name;
+            if (asset.Name.Length > 64)
+            {
+                assetName = asset.Name.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+            }
+            
+            string assetDescription = asset.Description;
+            if (asset.Description.Length > 64)
+            {
+                assetDescription = asset.Description.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+                command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
+                command.Parameters.Add(m_database.CreateParameter("name", assetName));
+                command.Parameters.Add(m_database.CreateParameter("description", assetDescription));
+                command.Parameters.Add(m_database.CreateParameter("assetType", asset.Type));
+                command.Parameters.Add(m_database.CreateParameter("local", asset.Local));
+                command.Parameters.Add(m_database.CreateParameter("temporary", asset.Temporary));
+                command.Parameters.Add(m_database.CreateParameter("access_time", now));
+                command.Parameters.Add(m_database.CreateParameter("create_time", now));
+                command.Parameters.Add(m_database.CreateParameter("asset_flags", (int)asset.Flags));
+                command.Parameters.Add(m_database.CreateParameter("creatorid", asset.Metadata.CreatorID));
+                command.Parameters.Add(m_database.CreateParameter("data", asset.Data));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch(Exception e)
+                {
+                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
+                }
+            }
+        }
+
+
+// Commented out since currently unused - this probably should be called in GetAsset()
+//        private void UpdateAccessTime(AssetBase asset)
+//        {
+//            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = :access_time WHERE id=:id"))
+//            {
+//                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+//                cmd.Parameters.AddWithValue(":id", asset.FullID.ToString());
+//                cmd.Parameters.AddWithValue(":access_time", now);
+//                try
+//                {
+//                    cmd.ExecuteNonQuery();
+//                }
+//                catch (Exception e)
+//                {
+//                    m_log.Error(e.ToString());
+//                }
+//            }
+//        }
+
+        /// <summary>
+        /// Check if asset exist in m_database
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <returns>true if exist.</returns>
+        override public bool ExistsAsset(UUID uuid)
+        {
+            if (GetAsset(uuid) != null)
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns a list of AssetMetadata objects. The list is a subset of
+        /// the entire data set offset by <paramref name="start" /> containing
+        /// <paramref name="count" /> elements.
+        /// </summary>
+        /// <param name="start">The number of results to discard from the total data set.</param>
+        /// <param name="count">The number of rows the returned list should contain.</param>
+        /// <returns>A list of AssetMetadata objects.</returns>
+        public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
+        {
+            List<AssetMetadata> retList = new List<AssetMetadata>(count);
+            string sql = @" SELECT id, name, description, assetType, temporary, creatorid,
+                                   RowNumber = ROW_NUMBER()
+                              FROM assets 
+                             order by id
+                             limit :stop
+                            offset :start;";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("start", start));
+                cmd.Parameters.Add(m_database.CreateParameter("stop", start + count - 1));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        AssetMetadata metadata = new AssetMetadata();
+                        metadata.FullID = DBGuid.FromDB(reader["id"]);
+                        metadata.Name = (string)reader["name"];
+                        metadata.Description = (string)reader["description"];
+                        metadata.Type = Convert.ToSByte(reader["assetType"]);
+                        metadata.Temporary = Convert.ToBoolean(reader["temporary"]);
+                        metadata.CreatorID = (string)reader["creatorid"];
+                        retList.Add(metadata);
+                    }
+                }
+            }
+
+            return retList;
+        }
+
+        public override bool Delete(string id)
+        {
+            return false;
+        }
+        #endregion
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -0,0 +1,229 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using System.Reflection;
+using System.Text;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLAuthenticationData : IAuthenticationData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames = null;
+        private int m_LastExpire = 0;
+        private string m_ConnectionString;
+        private PGSQLManager m_database;
+
+        public PGSQLAuthenticationData(string connectionString, string realm)
+        {
+            m_Realm = realm;
+            m_ConnectionString = connectionString;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
+                m_database = new PGSQLManager(m_ConnectionString);
+                m.Update();
+            }
+        }
+
+        public AuthenticationData Get(UUID principalID)
+        {
+            AuthenticationData ret = new AuthenticationData();
+            ret.Data = new Dictionary<string, object>();
+
+            string sql = string.Format("select * from {0} where UUID = :principalID", m_Realm);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter(":principalID", principalID));
+                conn.Open();
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
+                {
+                    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;
+                    }
+                }
+            }
+            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();
+            StringBuilder updateBuilder = new StringBuilder();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                updateBuilder.AppendFormat("update {0} set ", m_Realm);
+
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        updateBuilder.Append(", ");
+                    updateBuilder.AppendFormat("{0} = :{0}",field);
+
+                    first = false;
+                    cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
+                }
+
+                updateBuilder.Append(" where UUID = :principalID");
+
+                cmd.CommandText = updateBuilder.ToString();
+                cmd.Connection = conn;
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
+                
+                conn.Open();
+                if (cmd.ExecuteNonQuery() < 1)
+                {
+                    StringBuilder insertBuilder = new StringBuilder();
+
+                    insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm);
+                    insertBuilder.Append(String.Join(", ", fields));
+                    insertBuilder.Append(") values (:principalID, :");
+                    insertBuilder.Append(String.Join(", :", fields));
+                    insertBuilder.Append(")");
+
+                    cmd.CommandText = insertBuilder.ToString();
+
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            string sql = string.Format("update {0} set {1} = :{1} where UUID = :UUID", m_Realm, item);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public bool SetToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+            
+            string sql = "insert into tokens (UUID, token, validity) values (:principalID, :token, :lifetime)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("lifetime", DateTime.Now.AddMinutes(lifetime)));
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool CheckToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            DateTime validDate = DateTime.Now.AddMinutes(lifetime);
+            string sql = "update tokens set validity = :validDate where UUID = :principalID and token = :token and validity > (CURRENT_DATE + CURRENT_TIME)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("validDate", validDate));
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private void DoExpire()
+        {
+            DateTime currentDateTime = DateTime.Now;
+            string sql = "delete from tokens where validity < :currentDateTime";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                conn.Open();
+                cmd.Parameters.Add(m_database.CreateParameter("currentDateTime", currentDateTime));
+                cmd.ExecuteNonQuery();
+            }
+            m_LastExpire = System.Environment.TickCount;
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
@@ -0,0 +1,72 @@
+/*
+ * 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.Generic;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
+
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for Avatar Storage
+    /// </summary>
+    public class PGSQLAvatarData : PGSQLGenericTableHandler<AvatarBaseData>,
+            IAvatarData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public PGSQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+        {
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format("DELETE FROM {0} where PrincipalID = :PrincipalID and Name = :Name", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("Name", name));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+
+                return false;
+            }
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -0,0 +1,589 @@
+/*
+ * 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.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLEstateStore : IEstateDataStore
+    {
+        private const string _migrationStore = "EstateStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private PGSQLManager _Database;
+        private string m_connectionString;
+        private FieldInfo[] _Fields;
+        private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
+
+        #region Public methods
+
+        public PGSQLEstateStore()
+        {
+        }
+
+        public PGSQLEstateStore(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+
+        /// <summary>
+        /// Initialises the estatedata class.
+        /// </summary>
+        /// <param name="connectionString">connectionString.</param>
+        public void Initialise(string connectionString)
+        {
+            if (!string.IsNullOrEmpty(connectionString))
+            {
+                m_connectionString = connectionString;
+                _Database = new PGSQLManager(connectionString);
+            }
+
+            //Migration settings
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
+                m.Update();
+            }
+
+            //Interesting way to get parameters! Maybe implement that also with other types
+            Type t = typeof(EstateSettings);
+            _Fields = t.GetFields(BindingFlags.NonPublic |
+                                  BindingFlags.Instance |
+                                  BindingFlags.DeclaredOnly);
+
+            foreach (FieldInfo f in _Fields)
+            {
+                if (f.Name.Substring(0, 2) == "m_")
+                    _FieldMap[f.Name.Substring(2)] = f;
+            }
+        }
+
+        /// <summary>
+        /// Loads the estate settings.
+        /// </summary>
+        /// <param name="regionID">region ID.</param>
+        /// <returns></returns>
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
+        {
+            EstateSettings es = new EstateSettings();
+
+            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + 
+                         " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID " + 
+                         " where estate_settings.EstateID is not null and RegionID = :RegionID";
+
+            bool insertEstate = false;
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("RegionID", regionID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        foreach (string name in FieldList)
+                        {
+                            FieldInfo f = _FieldMap[name];
+                            object v = reader[name];
+                            if (f.FieldType == typeof(bool))
+                            {
+                                f.SetValue(es, Convert.ToInt32(v) != 0);
+                            }
+                            else if (f.FieldType == typeof(UUID))
+                            {
+                                f.SetValue(es, new UUID((Guid)v)); // uuid);
+                            }
+                            else if (f.FieldType == typeof(string))
+                            {
+                                f.SetValue(es, v.ToString());
+                            }
+                            else if (f.FieldType == typeof(UInt32))
+                            {
+                                f.SetValue(es, Convert.ToUInt32(v));
+                            }
+                            else if (f.FieldType == typeof(Single))
+                            {
+                                f.SetValue(es, Convert.ToSingle(v));
+                            }
+                            else
+                                f.SetValue(es, v);
+                        }
+                    }
+                    else
+                    {
+                        insertEstate = true;
+                    }
+                }
+            }
+
+            if (insertEstate && create)
+            {
+                DoCreate(es);
+                LinkRegion(regionID, (int)es.EstateID);
+            }
+
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            //Set event
+            es.OnSave += StoreEstateSettings;
+            return es;
+        }
+
+        public EstateSettings CreateNewEstate()
+        {
+            EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
+
+            DoCreate(es);
+
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            return es;
+        }
+
+        private void DoCreate(EstateSettings es)
+        {
+            List<string> names = new List<string>(FieldList);
+
+            names.Remove("EstateID");
+
+            string sql = string.Format("insert into estate_settings ({0}) values ( :{1})", String.Join(",", names.ToArray()), String.Join(", :", names.ToArray()));
+
+            //_Log.Debug("[DB ESTATE]: SQL: " + sql);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn))
+            {
+                insertCommand.CommandText = sql + "; Select ID = lastval() ;";
+
+                foreach (string name in names)
+                {
+                    insertCommand.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
+                }
+                //NpgsqlParameter idParameter = new NpgsqlParameter("ID", SqlDbType.Int);
+                //idParameter.Direction = ParameterDirection.Output;
+                //insertCommand.Parameters.Add(idParameter);
+                conn.Open();
+
+                es.EstateID = 100;
+
+                using (NpgsqlDataReader result = insertCommand.ExecuteReader())
+                {
+                    if (result.Read())
+                    {
+                        es.EstateID = (uint)result.GetInt32(0);
+                    }
+                }
+
+            }
+
+            //TODO check if this is needed??
+            es.Save();
+        }
+
+        /// <summary>
+        /// Stores the estate settings.
+        /// </summary>
+        /// <param name="es">estate settings</param>
+        public void StoreEstateSettings(EstateSettings es)
+        {
+            List<string> names = new List<string>(FieldList);
+
+            names.Remove("EstateID");
+
+            string sql = string.Format("UPDATE estate_settings SET ");
+            foreach (string name in names)
+            {
+                sql += name + " = :" + name + ", ";
+            }
+            sql = sql.Remove(sql.LastIndexOf(","));
+            sql += " WHERE EstateID = :EstateID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                foreach (string name in names)
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
+                }
+
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", es.EstateID));
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+
+            SaveBanList(es);
+            SaveUUIDList(es.EstateID, "estate_managers", es.EstateManagers);
+            SaveUUIDList(es.EstateID, "estate_users", es.EstateAccess);
+            SaveUUIDList(es.EstateID, "estate_groups", es.EstateGroups);
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private string[] FieldList
+        {
+            get { return new List<string>(_FieldMap.Keys).ToArray(); }
+        }
+
+        private void LoadBanList(EstateSettings es)
+        {
+            es.ClearBans();
+
+            string sql = "select bannedUUID from estateban where EstateID = :EstateID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                NpgsqlParameter idParameter = new NpgsqlParameter("EstateID", SqlDbType.Int);
+                idParameter.Value = es.EstateID;
+                cmd.Parameters.Add(idParameter);
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        EstateBan eb = new EstateBan();
+
+                        eb.BannedUserID = new UUID((Guid)reader["bannedUUID"]); //uuid;
+                        eb.BannedHostAddress = "0.0.0.0";
+                        eb.BannedHostIPMask = "0.0.0.0";
+                        es.AddBan(eb);
+                    }
+                }
+            }
+        }
+
+        private UUID[] LoadUUIDList(uint estateID, string table)
+        {
+            List<UUID> uuids = new List<UUID>();
+
+            string sql = string.Format("select uuid from {0} where EstateID = :EstateID", table);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", estateID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        uuids.Add(new UUID((Guid)reader["uuid"])); //uuid);
+                    }
+                }
+            }
+
+            return uuids.ToArray();
+        }
+
+        private void SaveBanList(EstateSettings es)
+        {
+            //Delete first
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = "delete from estateban where EstateID = :EstateID";
+                    cmd.Parameters.AddWithValue("EstateID", (int)es.EstateID);
+                    cmd.ExecuteNonQuery();
+
+                    //Insert after
+                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID,bannedIp, bannedIpHostMask, bannedNameMask) values ( :EstateID, :bannedUUID, '','','' )";
+                    cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty);
+                    foreach (EstateBan b in es.EstateBans)
+                    {
+                        cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+        }
+
+        private void SaveUUIDList(uint estateID, string table, UUID[] data)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    cmd.CommandText = string.Format("delete from {0} where EstateID = :EstateID", table);
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = string.Format("insert into {0} (EstateID, uuid) values ( :EstateID, :uuid )", table);
+                    cmd.Parameters.AddWithValue("uuid", Guid.Empty);
+                    foreach (UUID uuid in data)
+                    {
+                        cmd.Parameters["uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+        }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            EstateSettings es = new EstateSettings();
+            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_settings where EstateID = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            foreach (string name in FieldList)
+                            {
+                                FieldInfo f = _FieldMap[name];
+                                object v = reader[name];
+                                if (f.FieldType == typeof(bool))
+                                {
+                                    f.SetValue(es, Convert.ToInt32(v) != 0);
+                                }
+                                else if (f.FieldType == typeof(UUID))
+                                {
+                                    f.SetValue(es, new UUID((Guid)v)); // uuid);
+                                }
+                                else if (f.FieldType == typeof(string))
+                                {
+                                    f.SetValue(es, v.ToString());
+                                }
+                                else if (f.FieldType == typeof(UInt32))
+                                {
+                                    f.SetValue(es, Convert.ToUInt32(v));
+                                }
+                                else if (f.FieldType == typeof(Single))
+                                {
+                                    f.SetValue(es, Convert.ToSingle(v));
+                                }
+                                else
+                                    f.SetValue(es, v);
+                            }
+                        }
+
+                    }
+                }
+            }
+            LoadBanList(es);
+
+            es.EstateManagers = LoadUUIDList(es.EstateID, "estate_managers");
+            es.EstateAccess = LoadUUIDList(es.EstateID, "estate_users");
+            es.EstateGroups = LoadUUIDList(es.EstateID, "estate_groups");
+
+            //Set event
+            es.OnSave += StoreEstateSettings;
+            return es;
+
+        }
+
+        public List<EstateSettings> LoadEstateSettingsAll()
+        {
+            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
+
+            List<int> allEstateIds = GetEstatesAll();
+
+            foreach (int estateId in allEstateIds)
+                allEstateSettings.Add(LoadEstateSettings(estateId));
+
+            return allEstateSettings;
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings where EstateName = :EstateName";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateName", search);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesAll()
+        {
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public List<int> GetEstatesByOwner(UUID ownerID)
+        {
+            List<int> result = new List<int>();
+            string sql = "select estateID from estate_settings where EstateOwner = :EstateOwner";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateOwner", ownerID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            string deleteSQL = "delete from estate_map where RegionID = :RegionID";
+            string insertSQL = "insert into estate_map values (:RegionID, :EstateID)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+
+                NpgsqlTransaction transaction = conn.BeginTransaction();
+
+                try
+                {
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(deleteSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
+
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(insertSQL, conn))
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("EstateID", estateID);
+
+                        int ret = cmd.ExecuteNonQuery();
+
+                        if (ret != 0)
+                            transaction.Commit();
+                        else
+                            transaction.Rollback();
+
+                        return (ret != 0);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
+                    transaction.Rollback();
+                }
+            }
+            return false;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            List<UUID> result = new List<UUID>();
+            string sql = "select RegionID from estate_map where EstateID = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.AddWithValue("EstateID", estateID);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(DBGuid.FromDB(reader["RegionID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            // TODO: Implementation!            
+            return false;
+        }
+        #endregion
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -0,0 +1,101 @@
+/*
+ * 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 System.Reflection;
+using System.Text;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLFriendsData : PGSQLGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public PGSQLFriendsData(string connectionString, string realm)
+            : base(connectionString, realm, "FriendsStore")
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
+                m.Update();
+            }
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            return Delete(principalID.ToString(), friend);
+        }
+
+        public bool Delete(string principalID, string friend)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("Friend", friend));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+
+                return true;
+            }
+        }
+
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+
+        public FriendsData[] GetFriends(string principalID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                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.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public FriendsData[] GetFriends(Guid principalID)
+        {
+            return GetFriends(principalID.ToString());
+        }
+ 
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -0,0 +1,387 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using System.Text;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLGenericTableHandler<T> where T : class, new()
+    {
+//        private static readonly ILog m_log =
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected string m_ConnectionString;
+        protected PGSQLManager m_database; //used for parameter type translation
+        protected Dictionary<string, FieldInfo> m_Fields =
+                new Dictionary<string, FieldInfo>();
+
+        protected List<string> m_ColumnNames = null;
+        protected string m_Realm;
+        protected FieldInfo m_DataField = null;
+
+        public PGSQLGenericTableHandler(string connectionString,
+                string realm, string storeName)
+        {
+            m_Realm = realm;
+            
+            m_ConnectionString = connectionString;
+
+            if (storeName != String.Empty)
+            {
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+                {
+                    conn.Open();
+                    Migration m = new Migration(conn, GetType().Assembly, storeName);
+                    m.Update();
+                }
+
+            }
+            m_database = new PGSQLManager(m_ConnectionString);
+
+            Type t = typeof(T);
+            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
+                                             BindingFlags.Instance |
+                                             BindingFlags.DeclaredOnly);
+
+            if (fields.Length == 0)
+                return;
+
+            foreach (FieldInfo f in fields)
+            {
+                if (f.Name != "Data")
+                    m_Fields[f.Name] = f;
+                else
+                    m_DataField = f;
+            }
+
+        }
+
+        private void CheckColumnNames(NpgsqlDataReader reader)
+        {
+            if (m_ColumnNames != null)
+                return;
+
+            m_ColumnNames = new List<string>();
+
+            DataTable schemaTable = reader.GetSchemaTable();
+            foreach (DataRow row in schemaTable.Rows)
+            {
+                if (row["ColumnName"] != null &&
+                        (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
+
+            }
+        }
+
+        // TODO GET CONSTRAINTS FROM POSTGRESQL
+        private List<string> GetConstraints()
+        {
+            List<string> constraints = new List<string>();
+            string query = string.Format(@"SELECT 
+                            COL_NAME(ic.object_id,ic.column_id) AS column_name
+                            FROM sys.indexes AS i
+                            INNER JOIN sys.index_columns AS ic 
+                              ON i.object_id = ic.object_id AND i.index_id = ic.index_id
+                            WHERE i.is_primary_key = 1 
+                            AND i.object_id = OBJECT_ID('{0}');", m_Realm);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
+            {
+                conn.Open();
+                using (NpgsqlDataReader rdr = cmd.ExecuteReader())
+                {
+                    while (rdr.Read())
+                    {
+                        // query produces 0 to many rows of single column, so always add the first item in each row
+                        constraints.Add((string)rdr[0]);
+                    }
+                }
+                return constraints;
+            }
+        }
+
+        public virtual T[] Get(string field, string key)
+        {
+            return Get(new string[] { field }, new string[] { key });
+        }
+
+        public virtual T[] Get(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return new T[0];
+
+            List<string> terms = new List<string>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add(" " + fields[i] + " = :" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        protected T[] DoQuery(NpgsqlCommand cmd)
+        {
+            List<T> result = new List<T>();
+            using (NpgsqlDataReader reader = cmd.ExecuteReader())
+            {
+                if (reader == null)
+                    return new T[0];
+
+                CheckColumnNames(reader);                
+
+                while (reader.Read())
+                {
+                    T row = new T();
+
+                    foreach (string name in m_Fields.Keys)
+                    {
+                        if (m_Fields[name].GetValue(row) is bool)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v != 0 ? true : false);
+                        }
+                        else if (m_Fields[name].GetValue(row) is UUID)
+                        {
+                            UUID uuid = UUID.Zero;
+
+                            UUID.TryParse(reader[name].ToString(), out uuid);
+                            m_Fields[name].SetValue(row, uuid);
+                        }
+                        else if (m_Fields[name].GetValue(row) is int)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v);
+                        }
+                        else
+                        {
+                            m_Fields[name].SetValue(row, reader[name]);
+                        }
+                    }
+
+                    if (m_DataField != null)
+                    {
+                        Dictionary<string, string> data =
+                                new Dictionary<string, string>();
+
+                        foreach (string col in m_ColumnNames)
+                        {
+                            data[col] = reader[col].ToString();
+                            if (data[col] == null)
+                                data[col] = String.Empty;
+                        }
+
+                        m_DataField.SetValue(row, data);
+                    }
+
+                    result.Add(row);
+                }
+                return result.ToArray();
+            }
+        }
+
+        public virtual T[] Get(string where)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+
+                //m_log.WarnFormat("[PGSQLGenericTable]: SELECT {0} WHERE {1}", m_Realm, where);
+
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public virtual bool Store(T row)
+        {
+            List<string> constraintFields = GetConstraints();
+            List<KeyValuePair<string, string>> constraints = new List<KeyValuePair<string, string>>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                StringBuilder query = new StringBuilder();
+                List<String> names = new List<String>();
+                List<String> values = new List<String>();
+
+                foreach (FieldInfo fi in m_Fields.Values)
+                {
+                    names.Add(fi.Name);
+                    values.Add("" + fi.Name);
+                    // Temporarily return more information about what field is unexpectedly null for
+                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // InventoryTransferModule or we may be required to substitute a DBNull here.
+                    if (fi.GetValue(row) == null)
+                        throw new NullReferenceException(
+                            string.Format(
+                                "[PGSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
+                                fi.Name, row));
+
+                    if (constraintFields.Count > 0 && constraintFields.Contains(fi.Name))
+                    {
+                        constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString()));
+                    }
+                    cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row).ToString()));
+                }
+
+                if (m_DataField != null)
+                {
+                    Dictionary<string, string> data =
+                            (Dictionary<string, string>)m_DataField.GetValue(row);
+
+                    foreach (KeyValuePair<string, string> kvp in data)
+                    {
+                        if (constraintFields.Count > 0 && constraintFields.Contains(kvp.Key))
+                        {
+                            constraints.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Key));
+                        }
+                        names.Add(kvp.Key);
+                        values.Add("" + kvp.Key);
+
+                        cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value));
+                    }
+
+                }
+
+                query.AppendFormat("UPDATE {0} SET ", m_Realm);
+                int i = 0;
+                for (i = 0; i < names.Count - 1; i++)
+                {
+                    query.AppendFormat("[{0}] = {1}, ", names[i], values[i]);
+                }
+                query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
+                if (constraints.Count > 0)
+                {
+                    List<string> terms = new List<string>();
+                    for (int j = 0; j < constraints.Count; j++)
+                    {
+                        terms.Add(" " + constraints[j].Key + " = :" + constraints[j].Key);
+                    }
+                    string where = String.Join(" AND ", terms.ToArray());
+                    query.AppendFormat(" WHERE {0} ", where);
+                    
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = query.ToString();
+                
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.WarnFormat("[PGSQLGenericTable]: Updating {0}", m_Realm);
+                    return true;
+                }
+                else
+                {
+                    // assume record has not yet been inserted
+
+                    query = new StringBuilder();
+                    query.AppendFormat("INSERT INTO {0} (", m_Realm);
+                    query.Append(String.Join(",", names.ToArray()));
+                    query.Append(") values (" + String.Join(",", values.ToArray()) + ")");
+                    cmd.Connection = conn;
+                    cmd.CommandText = query.ToString();
+                    //m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0}", m_Realm);
+                    if (conn.State != ConnectionState.Open)
+                        conn.Open();
+                    if (cmd.ExecuteNonQuery() > 0)
+                        return true;
+                }
+
+                return false;
+            }
+        }
+
+        public virtual bool Delete(string field, string key)
+        {
+            return Delete(new string[] { field }, new string[] { key });
+        }
+
+        public virtual bool Delete(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return false;
+
+            List<string> terms = new List<string>();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add(" " + fields[i] + " = :" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("DELETE FROM {0} WHERE {1}", m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.Warn("[PGSQLGenericTable]: " + deleteCommand);
+                    return true;
+                }
+                return false;
+            }
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
@@ -0,0 +1,68 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for Avatar Storage
+    /// </summary>
+    public class PGSQLGridUserData : PGSQLGenericTableHandler<GridUserData>,
+            IGridUserData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLGridUserData(string connectionString, string realm) :
+            base(connectionString, realm, "GridUserStore")
+        {
+        }
+
+        public new GridUserData Get(string userID)
+        {
+            GridUserData[] ret = Get("UserID", userID);
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
+        }
+
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -0,0 +1,831 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL interface for the inventory server
+    /// </summary>
+    public class PGSQLInventoryData : IInventoryDataPlugin
+    {
+        private const string _migrationStore = "InventoryStore";
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// The database manager
+        /// </summary>
+        private PGSQLManager database;
+        private string m_connectionString;
+
+        #region IPlugin members
+
+        [Obsolete("Cannot be default-initialized!")]
+        public void Initialise()
+        {
+            m_log.Info("[PGSQLInventoryData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
+        }
+
+        /// <summary>
+        /// Loads and initialises the PGSQL inventory storage interface
+        /// </summary>
+        /// <param name="connectionString">connect string</param>
+        /// <remarks>use PGSQL_connection.ini</remarks>
+        public void Initialise(string connectionString)
+        {
+            m_connectionString = connectionString;
+            database = new PGSQLManager(connectionString);
+          
+            //New migrations check of store
+            database.CheckMigration(_migrationStore);
+        }
+
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        /// <returns>A string containing the name of the DB provider</returns>
+        public string Name
+        {
+            get { return "PGSQL Inventory Data Interface"; }
+        }
+
+        /// <summary>
+        /// Closes this DB provider
+        /// </summary>
+        public void Dispose()
+        {
+            database = null;
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string Version
+        {
+            get { return database.getVersion(); }
+        }
+
+        #endregion
+
+        #region Folder methods
+
+        /// <summary>
+        /// Returns a list of the root folders within a users inventory
+        /// </summary>
+        /// <param name="user">The user whos inventory is to be searched</param>
+        /// <returns>A list of folder objects</returns>
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
+        {
+            if (user == UUID.Zero)
+                return new List<InventoryFolderBase>();
+
+            return getInventoryFolders(UUID.Zero, user);
+        }
+
+        /// <summary>
+        /// see InventoryItemBase.getUserRootFolder
+        /// </summary>
+        /// <param name="user">the User UUID</param>
+        /// <returns></returns>
+        public InventoryFolderBase getUserRootFolder(UUID user)
+        {
+            List<InventoryFolderBase> items = getUserRootFolders(user);
+
+            InventoryFolderBase rootFolder = null;
+
+            // There should only ever be one root folder for a user.  However, if there's more
+            // than one we'll simply use the first one rather than failing.  It would be even
+            // nicer to print some message to this effect, but this feels like it's too low a
+            // to put such a message out, and it's too minor right now to spare the time to
+            // suitably refactor.
+            if (items.Count > 0)
+            {
+                rootFolder = items[0];
+            }
+
+            return rootFolder;
+        }
+
+        /// <summary>
+        /// Returns a list of folders in a users inventory contained within the specified folder
+        /// </summary>
+        /// <param name="parentID">The folder to search</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
+        {
+            return getInventoryFolders(parentID, UUID.Zero);
+        }
+
+        /// <summary>
+        /// Returns a specified inventory folder
+        /// </summary>
+        /// <param name="folderID">The folder to return</param>
+        /// <returns>A folder class</returns>
+        public InventoryFolderBase getInventoryFolder(UUID folderID)
+        {
+            string sql = "SELECT * FROM inventoryfolders WHERE folderID = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        return readInventoryFolder(reader);
+                    }
+                }
+            }
+            m_log.InfoFormat("[INVENTORY DB] : Found no inventory folder with ID : {0}", folderID);
+            return null;
+        }
+
+        /// <summary>
+        /// Returns all child folders in the hierarchy from the parent folder and down.
+        /// Does not return the parent folder itself.
+        /// </summary>
+        /// <param name="parentID">The folder to get subfolders for</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
+        {
+            //Note maybe change this to use a Dataset that loading in all folders of a user and then go throw it that way.
+            //Note this is changed so it opens only one connection to the database and not everytime it wants to get data.
+
+            /*  NOTE: the implementation below is very inefficient (makes a separate request to get subfolders for
+             * every found folder, recursively).  Inventory code for other DBs has been already rewritten to get ALL
+             * inventory for a specific user at once.
+             * 
+             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never 
+             * be used, so check for that and return an empty list.
+             */
+
+            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
+
+            if (parentID == UUID.Zero)
+                return folders;
+
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = :parentID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentID", parentID));
+                conn.Open();
+                folders.AddRange(getInventoryFolders(cmd));
+
+                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
+
+                foreach (InventoryFolderBase folderBase in folders)
+                {
+                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, cmd));
+                }
+                if (tempFolders.Count > 0)
+                {
+                    folders.AddRange(tempFolders);
+                }
+            }
+            return folders;
+        }
+
+        /// <summary>
+        /// Creates a new inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to create</param>
+        public void addInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = @"INSERT INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version) 
+                            VALUES (:folderID, :agentID, :parentFolderID, :folderName, :type, :version);";
+
+            string folderName = folder.Name;
+            if (folderName.Length > 64)
+            {
+                folderName = folderName.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add");
+            }
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void updateInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = @"UPDATE inventoryfolders SET agentID = :agentID, 
+                                                       parentFolderID = :parentFolderID,
+                                                       folderName = :folderName,
+                                                       type = :type,
+                                                       version = :version 
+                           WHERE folderID = :folderID";
+
+            string folderName = folder.Name;
+            if (folderName.Length > 64)
+            {
+                folderName = folderName.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update");
+            }
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates an inventory folder
+        /// </summary>
+        /// <param name="folder">Folder to update</param>
+        public void moveInventoryFolder(InventoryFolderBase folder)
+        {
+            string sql = @"UPDATE inventoryfolders SET parentFolderID = :parentFolderID WHERE folderID = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                conn.Open();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[INVENTORY DB]: Error : {0}", e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Delete an inventory folder
+        /// </summary>
+        /// <param name="folderID">Id of folder to delete</param>
+        public void deleteInventoryFolder(UUID folderID)
+        {
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = :parentID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                List<InventoryFolderBase> subFolders;
+                cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
+                conn.Open();
+                subFolders = getFolderHierarchy(folderID, cmd);
+                
+
+                //Delete all sub-folders
+                foreach (InventoryFolderBase f in subFolders)
+                {
+                    DeleteOneFolder(f.ID, conn);
+                    DeleteItemsInFolder(f.ID, conn);
+                }
+
+                //Delete the actual row
+                DeleteOneFolder(folderID, conn);
+                DeleteItemsInFolder(folderID, conn);
+            }
+        }
+
+        #endregion
+
+        #region Item Methods
+
+        /// <summary>
+        /// Returns a list of items in a specified folder
+        /// </summary>
+        /// <param name="folderID">The folder to search</param>
+        /// <returns>A list containing inventory items</returns>
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
+        {
+            string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = :parentFolderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
+                conn.Open();
+                List<InventoryItemBase> items = new List<InventoryItemBase>();
+
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        items.Add(readInventoryItem(reader));
+                    }
+                }
+                return items;
+            }
+        }
+
+        /// <summary>
+        /// Returns a specified inventory item
+        /// </summary>
+        /// <param name="itemID">The item ID</param>
+        /// <returns>An inventory item</returns>
+        public InventoryItemBase getInventoryItem(UUID itemID)
+        {
+            string sql = "SELECT * FROM inventoryitems WHERE inventoryID = :inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    if (reader.Read())
+                    {
+                        return readInventoryItem(reader);
+                    }
+                }
+            }
+            
+            m_log.InfoFormat("[INVENTORY DB]: Found no inventory item with ID : {0}", itemID);
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a specified item to the database
+        /// </summary>
+        /// <param name="item">The inventory item</param>
+        public void addInventoryItem(InventoryItemBase item)
+        {
+            if (getInventoryItem(item.ID) != null)
+            {
+                updateInventoryItem(item);
+                return;
+            }
+
+            string sql = @"INSERT INTO inventoryitems 
+                            (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, 
+                             inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions,
+                             invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, inventoryGroupPermissions,
+                             salePrice, saleType, creationDate, groupID, groupOwned, flags) 
+                        VALUES
+                            (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
+                             :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
+                             :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :salePrice, :saleType,
+                             :creationDate, :groupID, :groupOwned, :flags)";
+            
+            string itemName = item.Name;
+            if (item.Name.Length > 64)
+            {
+                itemName = item.Name.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters");
+            }
+            
+            string itemDesc = item.Description;
+            if (item.Description.Length > 128)
+            {
+                itemDesc = item.Description.Substring(0, 128);
+                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
+                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
+                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
+                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
+                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
+                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
+                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
+                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
+                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
+                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
+                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
+                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
+                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
+                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
+                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error inserting item :" + e.Message);
+                }
+            }
+
+            sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB] Error updating inventory folder for new item :" + e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the specified inventory item
+        /// </summary>
+        /// <param name="item">Inventory item to update</param>
+        public void updateInventoryItem(InventoryItemBase item)
+        {
+            string sql = @"UPDATE inventoryitems SET assetID = :assetID, 
+                                                assetType = :assetType,
+                                                parentFolderID = :parentFolderID,
+                                                avatarID = :avatarID,
+                                                inventoryName = :inventoryName, 
+                                                inventoryDescription = :inventoryDescription, 
+                                                inventoryNextPermissions = :inventoryNextPermissions, 
+                                                inventoryCurrentPermissions = :inventoryCurrentPermissions, 
+                                                invType = :invType, 
+                                                creatorID = :creatorID, 
+                                                inventoryBasePermissions = :inventoryBasePermissions, 
+                                                inventoryEveryOnePermissions = :inventoryEveryOnePermissions, 
+                                                inventoryGroupPermissions = :inventoryGroupPermissions, 
+                                                salePrice = :salePrice, 
+                                                saleType = :saleType, 
+                                                creationDate = :creationDate, 
+                                                groupID = :groupID, 
+                                                groupOwned = :groupOwned, 
+                                                flags = :flags 
+                                        WHERE inventoryID = :inventoryID";
+
+            string itemName = item.Name;
+            if (item.Name.Length > 64)
+            {
+                itemName = item.Name.Substring(0, 64);
+                m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters on update");
+            }
+            
+            string itemDesc = item.Description;
+            if (item.Description.Length > 128)
+            {
+                itemDesc = item.Description.Substring(0, 128);
+                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
+            }
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
+                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
+                command.Parameters.Add(database.CreateParameter("assetType", item.AssetType));
+                command.Parameters.Add(database.CreateParameter("parentFolderID", item.Folder));
+                command.Parameters.Add(database.CreateParameter("avatarID", item.Owner));
+                command.Parameters.Add(database.CreateParameter("inventoryName", itemName));
+                command.Parameters.Add(database.CreateParameter("inventoryDescription", itemDesc));
+                command.Parameters.Add(database.CreateParameter("inventoryNextPermissions", item.NextPermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryCurrentPermissions", item.CurrentPermissions));
+                command.Parameters.Add(database.CreateParameter("invType", item.InvType));
+                command.Parameters.Add(database.CreateParameter("creatorID", item.CreatorId));
+                command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
+                command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
+                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
+                command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
+                command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
+                command.Parameters.Add(database.CreateParameter("flags", item.Flags));
+                conn.Open();
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error updating item :" + e.Message);
+                }
+            }
+        }
+
+        // See IInventoryDataPlugin
+
+        /// <summary>
+        /// Delete an item in inventory database
+        /// </summary>
+        /// <param name="itemID">the item UUID</param>
+        public void deleteInventoryItem(UUID itemID)
+        {
+            string sql = "DELETE FROM inventoryitems WHERE inventoryID=:inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                try
+                {
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB]: Error deleting item :" + e.Message);
+                }
+            }
+        }
+
+        public InventoryItemBase queryInventoryItem(UUID itemID)
+        {
+            return getInventoryItem(itemID);
+        }
+
+        public InventoryFolderBase queryInventoryFolder(UUID folderID)
+        {
+            return getInventoryFolder(folderID);
+        }
+
+        /// <summary>
+        /// Returns all activated gesture-items in the inventory of the specified avatar.
+        /// </summary>
+        /// <param name="avatarID">The <see cref="UUID"/> of the avatar</param>
+        /// <returns>
+        /// The list of gestures (<see cref="InventoryItemBase"/>s)
+        /// </returns>
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
+        {
+            string sql = "SELECT * FROM inventoryitems WHERE avatarId = :uuid AND assetType = :assetType and flags = 1";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("uuid", avatarID));
+                cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
+                    while (reader.Read())
+                    {
+                        gestureList.Add(readInventoryItem(reader));
+                    }
+                    return gestureList;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Private methods
+
+        /// <summary>
+        /// Delete an item in inventory database
+        /// </summary>
+        /// <param name="folderID">the item ID</param>
+        /// <param name="connection">connection to the database</param>
+        private void DeleteItemsInFolder(UUID folderID, NpgsqlConnection connection)
+        {
+            using (NpgsqlCommand command = new NpgsqlCommand("DELETE FROM inventoryitems WHERE folderID=:folderID", connection))
+            {
+                command.Parameters.Add(database.CreateParameter("folderID", folderID));
+
+                try
+                {
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[INVENTORY DB] Error deleting item :" + e.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the folder hierarchy in a loop.
+        /// </summary>
+        /// <param name="parentID">parent ID.</param>
+        /// <param name="command">SQL command/connection to database</param>
+        /// <returns></returns>
+        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, NpgsqlCommand command)
+        {
+            command.Parameters["parentID"].Value = parentID.Guid; //.ToString();
+
+            List<InventoryFolderBase> folders = getInventoryFolders(command);
+
+            if (folders.Count > 0)
+            {
+                List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
+
+                foreach (InventoryFolderBase folderBase in folders)
+                {
+                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, command));
+                }
+
+                if (tempFolders.Count > 0)
+                {
+                    folders.AddRange(tempFolders);
+                }
+            }
+            return folders;
+        }
+
+        /// <summary>
+        /// Gets the inventory folders.
+        /// </summary>
+        /// <param name="parentID">parentID, use UUID.Zero to get root</param>
+        /// <param name="user">user id, use UUID.Zero, if you want all folders from a parentID.</param>
+        /// <returns></returns>
+        private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
+        {
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = :parentID AND agentID LIKE :uuid";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
+            {
+                if (user == UUID.Zero)
+                {
+                    command.Parameters.Add(database.CreateParameter("uuid", "%"));
+                }
+                else
+                {
+                    command.Parameters.Add(database.CreateParameter("uuid", user));
+                }
+                command.Parameters.Add(database.CreateParameter("parentID", parentID));
+                conn.Open();
+                return getInventoryFolders(command);
+            }
+        }
+
+        /// <summary>
+        /// Gets the inventory folders.
+        /// </summary>
+        /// <param name="command">SQLcommand.</param>
+        /// <returns></returns>
+        private static List<InventoryFolderBase> getInventoryFolders(NpgsqlCommand command)
+        {
+            using (NpgsqlDataReader reader = command.ExecuteReader())
+            {
+
+                List<InventoryFolderBase> items = new List<InventoryFolderBase>();
+                while (reader.Read())
+                {
+                    items.Add(readInventoryFolder(reader));
+                }
+                return items;
+            }
+        }
+
+        /// <summary>
+        /// Reads a list of inventory folders returned by a query.
+        /// </summary>
+        /// <param name="reader">A PGSQL Data Reader</param>
+        /// <returns>A List containing inventory folders</returns>
+        protected static InventoryFolderBase readInventoryFolder(NpgsqlDataReader reader)
+        {
+            try
+            {
+                InventoryFolderBase folder = new InventoryFolderBase();
+                folder.Owner = DBGuid.FromDB(reader["agentID"]);
+                folder.ParentID = DBGuid.FromDB(reader["parentFolderID"]);
+                folder.ID = DBGuid.FromDB(reader["folderID"]);
+                folder.Name = (string)reader["folderName"];
+                folder.Type = (short)reader["type"];
+                folder.Version = Convert.ToUInt16(reader["version"]);
+
+                return folder;
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[INVENTORY DB] Error reading inventory folder :" + e.Message);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Reads a one item from an SQL result
+        /// </summary>
+        /// <param name="reader">The SQL Result</param>
+        /// <returns>the item read</returns>
+        private static InventoryItemBase readInventoryItem(IDataRecord reader)
+        {
+            try
+            {
+                InventoryItemBase item = new InventoryItemBase();
+
+                item.ID = DBGuid.FromDB(reader["inventoryID"]);
+                item.AssetID = DBGuid.FromDB(reader["assetID"]);
+                item.AssetType = Convert.ToInt32(reader["assetType"].ToString());
+                item.Folder = DBGuid.FromDB(reader["parentFolderID"]);
+                item.Owner = DBGuid.FromDB(reader["avatarID"]);
+                item.Name = reader["inventoryName"].ToString();
+                item.Description = reader["inventoryDescription"].ToString();
+                item.NextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"]);
+                item.CurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"]);
+                item.InvType = Convert.ToInt32(reader["invType"].ToString());
+                item.CreatorId = reader["creatorID"].ToString();
+                item.BasePermissions = Convert.ToUInt32(reader["inventoryBasePermissions"]);
+                item.EveryOnePermissions = Convert.ToUInt32(reader["inventoryEveryOnePermissions"]);
+                item.GroupPermissions = Convert.ToUInt32(reader["inventoryGroupPermissions"]);
+                item.SalePrice = Convert.ToInt32(reader["salePrice"]);
+                item.SaleType = Convert.ToByte(reader["saleType"]);
+                item.CreationDate = Convert.ToInt32(reader["creationDate"]);
+                item.GroupID = DBGuid.FromDB(reader["groupID"]);
+                item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
+                item.Flags = Convert.ToUInt32(reader["flags"]);
+
+                return item;
+            }
+            catch (NpgsqlException e)
+            {
+                m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Delete a folder in inventory databasae
+        /// </summary>
+        /// <param name="folderID">the folder UUID</param>
+        /// <param name="connection">connection to database</param>
+        private void DeleteOneFolder(UUID folderID, NpgsqlConnection connection)
+        {
+            try
+            {
+                using (NpgsqlCommand command = new NpgsqlCommand("DELETE FROM inventoryfolders WHERE folderID=:folderID and type=-1", connection))
+                {
+                    command.Parameters.Add(database.CreateParameter("folderID", folderID));
+
+                    command.ExecuteNonQuery();
+                }
+            }
+            catch (NpgsqlException e)
+            {
+                m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message);
+            }
+        }
+
+        #endregion
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -0,0 +1,220 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A management class for the MS SQL Storage Engine
+    /// </summary>
+    public class PGSQLManager
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Connection string for ADO.net
+        /// </summary>
+        private readonly string connectionString;
+
+        /// <summary>
+        /// Initialize the manager and set the connectionstring
+        /// </summary>
+        /// <param name="connection"></param>
+        public PGSQLManager(string connection)
+        {
+            connectionString = connection;
+        }
+
+        /// <summary>
+        /// Type conversion to a SQLDbType functions
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        internal NpgsqlDbType DbtypeFromType(Type type)
+        {
+            if (type == typeof(string))
+            {
+                return NpgsqlDbType.Varchar;
+            }
+            if (type == typeof(double))
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (type == typeof(Single))
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (type == typeof(int))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(bool))
+            {
+                return NpgsqlDbType.Boolean;
+            }
+            if (type == typeof(UUID))
+            {
+                return NpgsqlDbType.Uuid;
+            }
+            if (type == typeof(sbyte))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(Byte[]))
+            {
+                return NpgsqlDbType.Bytea;
+            }
+            if (type == typeof(uint) || type == typeof(ushort))
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (type == typeof(ulong))
+            {
+                return NpgsqlDbType.Bigint;
+            }
+            if (type == typeof(DateTime))
+            {
+                return NpgsqlDbType.Timestamp;
+            }
+
+            return NpgsqlDbType.Varchar;
+        }
+
+        /// <summary>
+        /// Creates value for parameter.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        private static object CreateParameterValue(object value)
+        {
+            Type valueType = value.GetType();
+
+            if (valueType == typeof(UUID)) //TODO check if this works
+            {
+                return ((UUID) value).Guid;
+            }
+            if (valueType == typeof(UUID))
+            {
+                return ((UUID)value).Guid;
+            }
+            if (valueType == typeof(bool))
+            {
+                return (bool)value;
+            }
+            if (valueType == typeof(Byte[]))
+            {
+                return value;
+            }
+            if (valueType == typeof(int))
+            {
+                return value;
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Create a parameter for a command
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="parameterObject">parameter object.</param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject)
+        {
+            return CreateParameter(parameterName, parameterObject, false);
+        }
+
+        /// <summary>
+        /// Creates the parameter for a command.
+        /// </summary>
+        /// <param name="parameterName">Name of the parameter.</param>
+        /// <param name="parameterObject">parameter object.</param>
+        /// <param name="parameterOut">if set to <c>true</c> parameter is a output parameter</param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, bool parameterOut)
+        {
+            //Tweak so we dont always have to add @ sign
+            //if (!parameterName.StartsWith("@")) parameterName = "@" + parameterName;
+
+            //HACK if object is null, it is turned into a string, there are no nullable type till now
+            if (parameterObject == null) parameterObject = "";
+
+            NpgsqlParameter parameter = new NpgsqlParameter(parameterName, DbtypeFromType(parameterObject.GetType()));
+
+            if (parameterOut)
+            {
+                parameter.Direction = ParameterDirection.Output;
+            }
+            else
+            {
+                parameter.Direction = ParameterDirection.Input;
+                parameter.Value = CreateParameterValue(parameterObject);
+            }
+
+            return parameter;
+        }
+
+        /// <summary>
+        /// Checks if we need to do some migrations to the database
+        /// </summary>
+        /// <param name="migrationStore">migrationStore.</param>
+        public void CheckMigration(string migrationStore)
+        {
+            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) 
+            {
+                connection.Open();
+                Assembly assem = GetType().Assembly;
+                PGSQLMigration migration = new PGSQLMigration(connection, assem, migrationStore);
+
+                migration.Update();
+            }
+        }
+
+        /// <summary>
+        /// Returns the version of this DB provider
+        /// </summary>
+        /// <returns>A string containing the DB provider</returns>
+        public string getVersion()
+        {
+            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);
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLMigration.cs
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -0,0 +1,102 @@
+/*
+ * 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 Npgsql;
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Reflection;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLMigration : Migration
+    {
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string type)
+            : base(conn, assem, type)
+        {
+        }
+
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string subtype, string type)
+            : base(conn, assem, subtype, type)
+        {
+        }
+
+        protected override int FindVersion(DbConnection conn, string type)
+        {
+            int version = 0;
+            NpgsqlConnection lcConn = (NpgsqlConnection)conn;
+
+            using (NpgsqlCommand cmd = lcConn.CreateCommand())
+            {
+                try
+                {
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
+                                      " order by version desc limit 1"; //Must be 
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read())
+                        {
+                            version = Convert.ToInt32(reader["version"]);
+                        }
+                        reader.Close();
+                    }
+                }
+                catch
+                {
+                    // Return -1 to indicate table does not exist
+                    return -1;
+                }
+            }
+            return version;
+        }
+
+        protected override void ExecuteScript(DbConnection conn, string[] script)
+        {
+            if (!(conn is NpgsqlConnection))
+            {
+                base.ExecuteScript(conn, script);
+                return;
+            }
+
+            foreach (string sql in script)
+            {
+                try
+                {
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(sql, (NpgsqlConnection)conn))
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+                catch (Exception)
+                {
+                    throw new Exception(sql);
+
+                }
+            }
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -0,0 +1,117 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Presence Server
+    /// </summary>
+    public class PGSQLPresenceData : PGSQLGenericTableHandler<PresenceData>,
+            IPresenceData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLPresenceData(string connectionString, string realm) :
+                base(connectionString, realm, "Presence")
+        {
+        }
+
+        public PresenceData Get(UUID sessionID)
+        {
+            PresenceData[] ret = Get("SessionID",
+                    sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format("DELETE FROM {0} WHERE RegionID=:RegionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID)
+        {
+            PresenceData[] pd = Get("SessionID", sessionID.ToString());
+            if (pd.Length == 0)
+                return false;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                cmd.CommandText = String.Format(@"UPDATE {0} SET 
+                                                RegionID = :RegionID
+                                        WHERE SessionID = :SessionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("SessionID", sessionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() == 0)
+                    return false;
+            }
+            return true;
+        }
+
+        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
+        {
+            PresenceData[] ret = Get("SecureSessionID",
+                    secureSessionID.ToString());
+            
+            if (ret.Length == 0)
+                return false;
+
+            if(ret[0].UserID != agentId.ToString())
+                return false;
+
+            return true;
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -0,0 +1,353 @@
+/*
+ * 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.Generic;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using RegionFlags = OpenSim.Framework.RegionFlags;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A PGSQL Interface for the Region Server.
+    /// </summary>
+    public class PGSQLRegionData : IRegionData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames = null;
+        private string m_ConnectionString;
+        private PGSQLManager m_database;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public PGSQLRegionData(string connectionString, string realm) 
+        {
+            m_Realm = realm;
+            m_ConnectionString = connectionString;
+            m_database = new PGSQLManager(connectionString);
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "GridStore");
+                m.Update();
+            }
+         }
+
+        public List<RegionData> Get(string regionName, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where regionName like :regionName";
+            if (scopeID != UUID.Zero)
+                sql += " and ScopeID = :scopeID";
+            sql += " order by regionName";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("regionName", regionName));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+
+        public RegionData Get(int posX, int posY, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where locX = :posX and locY = :posY";
+            if (scopeID != UUID.Zero)
+                sql += " and ScopeID = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("posX", posX.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", posY.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+        }
+
+        public RegionData Get(UUID regionID, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where uuid = :regionID";
+            if (scopeID != UUID.Zero)
+                sql += " and ScopeID = :scopeID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("regionID", regionID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+        }
+
+        public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
+        {
+            string sql = "select * from "+m_Realm+" where locX between :startX and :endX and locY between :startY and :endY";
+            if (scopeID != UUID.Zero)
+                sql += " and ScopeID = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("startX", startX));
+                cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
+                cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+
+        public List<RegionData> RunCommand(NpgsqlCommand cmd)
+        {
+            List<RegionData> retList = new List<RegionData>();
+
+            NpgsqlDataReader result = cmd.ExecuteReader();
+
+            while (result.Read())
+            {
+                RegionData ret = new RegionData();
+                ret.Data = new Dictionary<string, object>();
+
+                UUID regionID;
+                UUID.TryParse(result["uuid"].ToString(), out regionID);
+                ret.RegionID = regionID;
+                UUID scope;
+                UUID.TryParse(result["ScopeID"].ToString(), out scope);
+                ret.ScopeID = scope;
+                ret.RegionName = result["regionName"].ToString();
+                ret.posX = Convert.ToInt32(result["locX"]);
+                ret.posY = Convert.ToInt32(result["locY"]);
+                ret.sizeX = Convert.ToInt32(result["sizeX"]);
+                ret.sizeY = Convert.ToInt32(result["sizeY"]);
+
+                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;
+                    if (s == "ScopeID")
+                        continue;
+                    if (s == "regionName")
+                        continue;
+                    if (s == "locX")
+                        continue;
+                    if (s == "locY")
+                        continue;
+
+                    ret.Data[s] = result[s].ToString();
+                }
+
+                retList.Add(ret);
+            }
+            return retList;
+        }
+
+        public bool Store(RegionData data)
+        {
+            if (data.Data.ContainsKey("uuid"))
+                data.Data.Remove("uuid");
+            if (data.Data.ContainsKey("ScopeID"))
+                data.Data.Remove("ScopeID");
+            if (data.Data.ContainsKey("regionName"))
+                data.Data.Remove("regionName");
+            if (data.Data.ContainsKey("posX"))
+                data.Data.Remove("posX");
+            if (data.Data.ContainsKey("posY"))
+                data.Data.Remove("posY");
+            if (data.Data.ContainsKey("sizeX"))
+                data.Data.Remove("sizeX");
+            if (data.Data.ContainsKey("sizeY"))
+                data.Data.Remove("sizeY");
+            if (data.Data.ContainsKey("locX"))
+                data.Data.Remove("locX");
+            if (data.Data.ContainsKey("locY"))
+                data.Data.Remove("locY");
+
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+
+                string update = "update " + m_Realm + " set locX=:posX, locY=:posY, sizeX=:sizeX, sizeY=:sizeY ";
+                
+                foreach (string field in fields)
+                {
+
+                    update += ", ";
+                    update += " " + field + " = :" + field;
+
+                    cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
+                }
+
+                update += " where uuid = :regionID";
+
+                if (data.ScopeID != UUID.Zero)
+                    update += " and ScopeID = :scopeID";
+
+                cmd.CommandText = update;
+                cmd.Connection = conn;
+                cmd.Parameters.Add(m_database.CreateParameter("regionID", data.RegionID));
+                cmd.Parameters.Add(m_database.CreateParameter("regionName", data.RegionName));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", data.ScopeID));
+                cmd.Parameters.Add(m_database.CreateParameter("posX", data.posX));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", data.posY));
+                cmd.Parameters.Add(m_database.CreateParameter("sizeX", data.sizeX));
+                cmd.Parameters.Add(m_database.CreateParameter("sizeY", data.sizeY));
+                conn.Open();
+                try
+                {
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        string insert = "insert into " + m_Realm + " (uuid, ScopeID, locX, locY, sizeX, sizeY, regionName, " +
+                                String.Join(", ", fields) +
+                                ") values (:regionID, :scopeID, :posX, :posY, :sizeX, :sizeY, :regionName, :" + String.Join(", :", fields) + ")";
+
+                        cmd.CommandText = insert;
+
+                        try
+                        {
+                            if (cmd.ExecuteNonQuery() < 1)
+                            {
+                                return false;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            m_log.Warn("[PGSQL Grid]: Error inserting into Regions table: " + ex.Message + ", INSERT sql: " + insert);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    m_log.Warn("[PGSQL Grid]: Error updating Regions table: " + ex.Message + ", UPDATE sql: " + update);
+                }
+            }
+
+            return true;
+        }
+
+        public bool SetDataItem(UUID regionID, string item, string value)
+        {
+            string sql = "update " + m_Realm +
+                    " set " + item + " = :" + item + " where uuid = :UUID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public bool Delete(UUID regionID)
+        {
+            string sql = "delete from " + m_Realm +
+                    " where uuid = :UUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+            }
+            return false;
+        }
+
+        public List<RegionData> GetDefaultRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultRegion, scopeID);
+        }
+
+        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
+        }
+
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
+            RegionDataDistanceCompare distanceComparer = new RegionDataDistanceCompare(x, y);
+            regions.Sort(distanceComparer);
+
+            return regions;
+        }
+
+        public List<RegionData> GetHyperlinks(UUID scopeID)
+        {
+            return Get((int)RegionFlags.Hyperlink, scopeID);
+        }
+
+        private List<RegionData> Get(int regionFlags, UUID scopeID)
+        {
+            string sql = "SELECT * FROM " + m_Realm + " WHERE (flags & " + regionFlags.ToString() + ") <> 0";
+            if (scopeID != UUID.Zero)
+                sql += " AND ScopeID = :scopeID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
--- a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
@@ -0,0 +1,246 @@
+/*
+ * 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 System.Text;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLUserAccountData : PGSQLGenericTableHandler<UserAccountData>,IUserAccountData
+    {
+        public PGSQLUserAccountData(string connectionString, string realm) :
+            base(connectionString, realm, "UserAccount")
+        {
+        }
+        //private string m_Realm;
+        //private List<string> m_ColumnNames = null;
+        //private PGSQLManager m_database;
+
+        //public PGSQLUserAccountData(string connectionString, string realm)
+        //{
+        //    m_Realm = realm;
+        //    m_ConnectionString = connectionString;
+        //    m_database = new PGSQLManager(connectionString);
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    {
+        //        conn.Open();
+        //        Migration m = new Migration(conn, GetType().Assembly, "UserStore");
+        //        m.Update();
+        //    }
+        //}
+
+        //public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+        //{
+        //    return null;
+        //}
+
+        //public UserAccountData Get(UUID principalID, UUID scopeID)
+        //{
+        //    UserAccountData ret = new UserAccountData();
+        //    ret.Data = new Dictionary<string, string>();
+
+        //    string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
+        //    if (scopeID != UUID.Zero)
+        //        sql += " and ScopeID = @scopeID";
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
+        //    {
+        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                
+        //        conn.Open();
+        //        using (SqlDataReader result = cmd.ExecuteReader())
+        //        {
+        //            if (result.Read())
+        //            {
+        //                ret.PrincipalID = principalID;
+        //                UUID scope;
+        //                UUID.TryParse(result["ScopeID"].ToString(), out scope);
+        //                ret.ScopeID = scope;
+
+        //                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;
+        //                    if (s == "ScopeID")
+        //                        continue;
+
+        //                    ret.Data[s] = result[s].ToString();
+        //                }
+        //                return ret;
+        //            }
+        //        }
+        //    }
+        //    return null;
+        //}
+
+        //public bool Store(UserAccountData data)
+        //{
+        //    if (data.Data.ContainsKey("UUID"))
+        //        data.Data.Remove("UUID");
+        //    if (data.Data.ContainsKey("ScopeID"))
+        //        data.Data.Remove("ScopeID");
+
+        //    string[] fields = new List<string>(data.Data.Keys).ToArray();
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand())
+        //    {
+        //        StringBuilder updateBuilder = new StringBuilder();
+        //        updateBuilder.AppendFormat("update {0} set ", m_Realm);
+        //        bool first = true;
+        //        foreach (string field in fields)
+        //        {
+        //            if (!first)
+        //                updateBuilder.Append(", ");
+        //            updateBuilder.AppendFormat("{0} = @{0}", field);
+
+        //            first = false;
+        //            cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+        //        }
+
+        //        updateBuilder.Append(" where UUID = @principalID");
+
+        //        if (data.ScopeID != UUID.Zero)
+        //            updateBuilder.Append(" and ScopeID = @scopeID");
+
+        //        cmd.CommandText = updateBuilder.ToString();
+        //        cmd.Connection = conn;
+        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
+        //        conn.Open();
+
+        //        if (cmd.ExecuteNonQuery() < 1)
+        //        {
+        //            StringBuilder insertBuilder = new StringBuilder();
+        //            insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
+        //            insertBuilder.Append(String.Join(", ", fields));
+        //            insertBuilder.Append(") values (@principalID, @scopeID, @");
+        //            insertBuilder.Append(String.Join(", @", fields));
+        //            insertBuilder.Append(")");
+
+        //            cmd.CommandText = insertBuilder.ToString();
+
+        //            if (cmd.ExecuteNonQuery() < 1)
+        //            {
+        //                return false;
+        //            }
+        //        }
+        //    }
+        //    return true;
+        //}
+
+        //public bool Store(UserAccountData data, UUID principalID, string token)
+        //{
+        //    return false;
+        //}
+
+        //public bool SetDataItem(UUID principalID, string item, string value)
+        //{
+        //    string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
+        //    {
+        //        cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@UUID", principalID));
+
+        //        conn.Open();
+
+        //        if (cmd.ExecuteNonQuery() > 0)
+        //            return true;
+        //    }
+        //    return false;
+        //}
+
+        //public UserAccountData[] Get(string[] keys, string[] vals)
+        //{
+        //    return null;
+        //}
+
+        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];
+
+            string sql = "";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                if (words.Length == 1)
+                {
+                    sql = String.Format("select * from {0} where (ScopeID=:ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like :search or LastName like :search)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                    cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%"));
+                }
+                else
+                {
+                    sql = String.Format("select * from {0} where (ScopeID=:ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like :searchFirst or LastName like :searchLast)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("searchFirst", "%" + words[0] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("searchLast", "%" + words[1] + "%"));
+                    cmd.Parameters.Add(m_database.CreateParameter("ScopeID", scopeID.ToString()));
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = sql;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -0,0 +1,305 @@
+/*
+ * 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 System.Reflection;
+using System.Text;
+using log4net;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLXInventoryData : IXInventoryData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private PGSQLFolderHandler m_Folders;
+        private PGSQLItemHandler m_Items;
+
+        public PGSQLXInventoryData(string conn, string realm)
+        {
+            m_Folders = new PGSQLFolderHandler(
+                    conn, "inventoryfolders", "InventoryStore");
+            m_Items = new PGSQLItemHandler(
+                    conn, "inventoryitems", String.Empty);
+        }
+
+        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Get(fields, vals);
+        }
+
+        public XInventoryItem[] GetItems(string[] fields, string[] vals)
+        {
+            return m_Items.Get(fields, vals);
+        }
+
+        public bool StoreFolder(XInventoryFolder folder)
+        {
+            if (folder.folderName.Length > 64)
+                folder.folderName = folder.folderName.Substring(0, 64);
+            return m_Folders.Store(folder);
+        }
+
+        public bool StoreItem(XInventoryItem item)
+        {
+            if (item.inventoryName.Length > 64)
+                item.inventoryName = item.inventoryName.Substring(0, 64);
+            if (item.inventoryDescription.Length > 128)
+                item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
+
+            return m_Items.Store(item);
+        }
+
+        public bool DeleteFolders(string field, string val)
+        {
+            return m_Folders.Delete(field, val);
+        }
+
+        public bool DeleteFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Delete(fields, vals);
+        }
+
+        public bool DeleteItems(string field, string val)
+        {
+            return m_Items.Delete(field, val);
+        }
+
+        public bool DeleteItems(string[] fields, string[] vals)
+        {
+            return m_Items.Delete(fields, vals);
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            return m_Items.MoveItem(id, newParent);
+        }
+
+        public bool MoveFolder(string id, string newParent)
+        {
+            return m_Folders.MoveFolder(id, newParent);
+        }
+
+        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        {
+            return m_Items.GetActiveGestures(principalID);
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            return m_Items.GetAssetPermissions(principalID, assetID);
+        }
+    }
+
+    public class PGSQLItemHandler : PGSQLInventoryHandler<XInventoryItem>
+    {
+        public PGSQLItemHandler(string c, string t, string m) :
+            base(c, t, m)
+        {
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            XInventoryItem[] retrievedItems = Get(new string[] { "inventoryID" }, new string[] { id });
+            if (retrievedItems.Length == 0)
+                return false;
+
+            UUID oldParent = retrievedItems[0].parentFolderID;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+
+                    cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where inventoryID = :InventoryID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newParent));
+                    cmd.Parameters.Add(m_database.CreateParameter("InventoryID", id));
+                    cmd.Connection = conn;
+                    conn.Open();
+
+                    if (cmd.ExecuteNonQuery() == 0)
+                        return false;
+                }
+            }
+
+            IncrementFolderVersion(oldParent);
+            IncrementFolderVersion(newParent);
+
+            return true;
+        }
+
+        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.CommandText = String.Format("select * from inventoryitems where avatarId = :uuid and assetType = :type and flags = 1", m_Realm);
+
+                    cmd.Parameters.Add(m_database.CreateParameter("uuid", principalID.ToString()));
+                    cmd.Parameters.Add(m_database.CreateParameter("type", (int)AssetType.Gesture));
+                    cmd.Connection = conn;
+                    conn.Open();
+                    return DoQuery(cmd);
+                }
+            }
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = :PrincipalID and assetID = :AssetID group by assetID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                    cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
+                    cmd.Connection = conn;
+                    conn.Open();
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+
+                        int perms = 0;
+
+                        if (reader.Read())
+                        {
+                            perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
+                        }
+
+                        return perms;
+                    }
+
+                }
+            }
+        }
+
+        public override bool Store(XInventoryItem item)
+        {
+            if (!base.Store(item))
+                return false;
+
+            IncrementFolderVersion(item.parentFolderID);
+
+            return true;
+        }
+    }
+
+    public class PGSQLFolderHandler : PGSQLInventoryHandler<XInventoryFolder>
+    {
+        public PGSQLFolderHandler(string c, string t, string m) :
+            base(c, t, m)
+        {
+        }
+
+        public bool MoveFolder(string id, string newParentFolderID)
+        {
+            XInventoryFolder[] folders = Get(new string[] { "folderID" }, new string[] { id });
+
+            if (folders.Length == 0)
+                return false;
+
+            UUID oldParentFolderUUID = folders[0].parentFolderID;
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
+                {
+
+                    cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where folderID = :folderID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newParentFolderID));
+                    cmd.Parameters.Add(m_database.CreateParameter("folderID", id));
+                    cmd.Connection = conn;
+                    conn.Open();
+
+                    if (cmd.ExecuteNonQuery() == 0)
+                        return false;
+                }
+            }
+
+            IncrementFolderVersion(oldParentFolderUUID);
+            IncrementFolderVersion(newParentFolderID);
+
+            return true;
+        }
+
+        public override bool Store(XInventoryFolder folder)
+        {
+            if (!base.Store(folder))
+                return false;
+
+            IncrementFolderVersion(folder.parentFolderID);
+
+            return true;
+        }
+    }
+
+    public class PGSQLInventoryHandler<T> : PGSQLGenericTableHandler<T> where T: class, new()
+    {
+        public PGSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
+
+        protected bool IncrementFolderVersion(UUID folderID)
+        {
+            return IncrementFolderVersion(folderID.ToString());
+        }
+
+        protected bool IncrementFolderVersion(string folderID)
+        {
+//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            Util.PrintCallStack();
+
+            string sql = "update inventoryfolders set version=version+1 where folderID = :folderID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    conn.Open();
+
+                    cmd.Parameters.AddWithValue("folderID", folderID);
+
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
--- a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
@@ -0,0 +1,65 @@
+/*
+ * 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.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.Data.PGSQL")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("http://opensimulator.org")]
+[assembly : AssemblyProduct("OpenSim.Data.PGSQL")]
+[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
+[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)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly : Guid("0e1c1ca4-2cf2-4315-b0e7-432c02feea8a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly : AssemblyVersion("0.7.6.*")]
+
--- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -0,0 +1,94 @@
+:VERSION 1
+
+CREATE TABLE assets (
+  id varchar(36) NOT NULL PRIMARY KEY,
+  name varchar(64) NOT NULL,
+  description varchar(64) NOT NULL,
+  assetType smallint NOT NULL,
+  local smallint NOT NULL,
+  temporary smallint NOT NULL,
+  data bytea NOT NULL
+) ;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_assets
+	(
+	id varchar(36) NOT NULL,
+	name varchar(64) NOT NULL,
+	description varchar(64) NOT NULL,
+	assetType smallint NOT NULL,
+	local boolean NOT NULL,
+	temporary boolean NOT NULL,
+	data bytea NOT NULL
+	) ; 
+
+INSERT INTO Tmp_assets (id, name, description, assetType, local, temporary, data)
+ SELECT id, name, description, assetType, case when local = 1 then true else false end, case when temporary = 1 then true else false end, data 
+   FROM assets ;
+
+DROP TABLE assets;
+
+Alter table Tmp_assets
+  rename to assets;
+
+ALTER TABLE assets ADD PRIMARY KEY (id);
+
+COMMIT;
+
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+ALTER TABLE assets add create_time integer default 0;
+ALTER TABLE assets add access_time integer default 0;
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_assets
+	(
+	id uuid NOT NULL,
+	name varchar(64) NOT NULL,
+	description varchar(64) NOT NULL,
+	assetType smallint NOT NULL,
+	local boolean NOT NULL,
+	temporary boolean NOT NULL,
+	data bytea NOT NULL,
+	create_time int NULL,
+	access_time int NULL
+	)  ;
+	 
+
+INSERT INTO Tmp_assets (id, name, description, assetType, local, temporary, data, create_time, access_time)
+		SELECT cast(id as uuid), name, description, assetType, local, temporary, data, create_time, access_time 
+		FROM assets ;
+
+DROP TABLE assets;
+
+Alter table Tmp_assets
+  rename to assets;
+
+ ALTER TABLE assets ADD PRIMARY KEY (id);
+
+COMMIT;
+
+
+:VERSION 5
+
+DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621';
+
+:VERSION 6
+
+ALTER TABLE assets ADD asset_flags INTEGER NOT NULL DEFAULT 0;
+
+:VERSION 7
+
+alter table assets add creatorid varchar(36) not null default '';
--- a/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
@@ -0,0 +1,31 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE auth (
+  uuid uuid NOT NULL default '00000000-0000-0000-0000-000000000000',
+  passwordHash varchar(32) NOT NULL,
+  passwordSalt varchar(32) NOT NULL,
+  webLoginKey varchar(255) NOT NULL,
+  accountType VARCHAR(32) NOT NULL DEFAULT 'UserAccount'
+) ;
+
+CREATE TABLE tokens (
+  uuid uuid NOT NULL default '00000000-0000-0000-0000-000000000000',
+  token varchar(255) NOT NULL,
+  validity TIMESTAMP NOT NULL )
+  ;
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+   INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) 
+	SELECT UUID AS UUID, passwordHash AS passwordHash, passwordSalt AS passwordSalt, webLoginKey AS webLoginKey, 'UserAccount' as accountType 
+	FROM users
+      where exists ( Select * from information_schema.tables where table_name = 'users' )
+	;
+
+COMMIT;
--- a/OpenSim/Data/PGSQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/PGSQL/Resources/Avatar.migrations
@@ -0,0 +1,59 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Avatars (
+PrincipalID uuid NOT NULL PRIMARY KEY, 
+Name varchar(32) NOT NULL, 
+Value varchar(255) NOT NULL DEFAULT ''
+);
+
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Avatars
+	(
+	PrincipalID uuid NOT NULL,
+	Name varchar(32) NOT NULL, 
+	Value text NOT NULL DEFAULT ''
+	)  ;
+	
+ INSERT INTO Tmp_Avatars (PrincipalID, Name, Value)
+	SELECT PrincipalID, cast(Name as text), Value 
+	FROM Avatars ;
+
+DROP TABLE Avatars;
+
+Alter table Tmp_Avatars
+  rename to Avatars;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Avatars
+	(
+	PrincipalID uuid NOT NULL,
+	Name varchar(32) NOT NULL, 
+	Value text NOT NULL DEFAULT ''
+);
+
+ALTER TABLE Tmp_Avatars ADD PRIMARY KEY (PrincipalID, Name);
+
+
+INSERT INTO Tmp_Avatars (PrincipalID, Name, Value)
+	SELECT PrincipalID, cast(Name as text), Value FROM Avatars ;
+
+DROP TABLE Avatars;
+
+Alter table Tmp_Avatars
+  rename to Avatars;
+
+COMMIT;
+
--- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
@@ -0,0 +1,288 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE estate_managers(
+	EstateID int NOT NULL Primary Key,
+	uuid varchar(36) NOT NULL
+ );
+ 
+CREATE TABLE estate_groups(
+	EstateID int NOT NULL,
+	uuid varchar(36) NOT NULL
+	);
+
+
+CREATE TABLE estate_users(
+	EstateID int NOT NULL,
+	uuid varchar(36) NOT NULL
+	);
+
+
+CREATE TABLE estateban(
+	EstateID int NOT NULL,
+	bannedUUID varchar(36) NOT NULL,
+	bannedIp varchar(16) NOT NULL,
+	bannedIpHostMask varchar(16) NOT NULL,
+	bannedNameMask varchar(64) NULL DEFAULT NULL
+	);
+
+CREATE TABLE estate_settings(
+	EstateID serial NOT NULL,
+	EstateName varchar(64) NULL DEFAULT (NULL),
+	AbuseEmailToEstateOwner boolean NOT NULL,
+	DenyAnonymous boolean NOT NULL,
+	ResetHomeOnTeleport boolean NOT NULL,
+	FixedSun boolean NOT NULL,
+	DenyTransacted boolean NOT NULL,
+	BlockDwell boolean NOT NULL,
+	DenyIdentified boolean NOT NULL,
+	AllowVoice boolean NOT NULL,
+	UseGlobalTime boolean NOT NULL,
+	PricePerMeter int NOT NULL,
+	TaxFree boolean NOT NULL,
+	AllowDirectTeleport boolean NOT NULL,
+	RedirectGridX int NOT NULL,
+	RedirectGridY int NOT NULL,
+	ParentEstateID int NOT NULL,
+	SunPosition double precision NOT NULL,
+	EstateSkipScripts boolean NOT NULL,
+	BillableFactor double precision NOT NULL,
+	PublicAccess boolean NOT NULL,
+	AbuseEmail varchar(255) NOT NULL,
+	EstateOwner varchar(36) NOT NULL,
+	DenyMinors boolean NOT NULL
+	);
+
+CREATE TABLE estate_map(
+	RegionID varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	EstateID int NOT NULL
+ );
+ 
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE INDEX IX_estate_managers ON estate_managers
+	(
+	EstateID
+	);
+
+
+CREATE INDEX IX_estate_groups ON estate_groups
+	(
+	EstateID
+	);
+
+
+CREATE INDEX IX_estate_users ON estate_users
+	(
+	EstateID
+	);
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estateban
+	(
+	EstateID int NOT NULL,
+	bannedUUID varchar(36) NOT NULL,
+	bannedIp varchar(16) NULL,
+	bannedIpHostMask varchar(16) NULL,
+	bannedNameMask varchar(64) NULL
+	);
+
+ INSERT INTO Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
+   SELECT EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask FROM estateban;
+
+DROP TABLE estateban;
+
+Alter table Tmp_estateban
+  rename to estateban;
+
+CREATE INDEX IX_estateban ON estateban
+	(
+	EstateID
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_managers
+	(
+	EstateID int NOT NULL,
+	uuid uuid NOT NULL
+	);
+
+INSERT INTO Tmp_estate_managers (EstateID, uuid)
+	SELECT EstateID, cast(uuid as uuid) FROM estate_managers;
+
+DROP TABLE estate_managers;
+
+Alter table Tmp_estate_managers
+  rename to estate_managers;
+
+CREATE INDEX IX_estate_managers ON estate_managers
+	(
+	EstateID
+	);
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_groups
+	(
+	EstateID int NOT NULL,
+	uuid uuid NOT NULL
+	) ;
+
+ INSERT INTO Tmp_estate_groups (EstateID, uuid)
+	SELECT EstateID, cast(uuid as uuid) FROM estate_groups;
+
+DROP TABLE estate_groups;
+
+Alter table Tmp_estate_groups
+  rename to estate_groups;
+
+CREATE INDEX IX_estate_groups ON estate_groups
+	(
+	EstateID
+	);
+
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_users
+	(
+	EstateID int NOT NULL,
+	uuid uuid NOT NULL
+	);
+
+INSERT INTO Tmp_estate_users (EstateID, uuid)
+	SELECT EstateID, cast(uuid as uuid) FROM estate_users ;
+
+DROP TABLE estate_users;
+
+Alter table Tmp_estate_users
+  rename to estate_users;
+
+CREATE INDEX IX_estate_users ON estate_users
+	(
+	EstateID
+	);
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estateban
+	(
+	EstateID int NOT NULL,
+	bannedUUID uuid NOT NULL,
+	bannedIp varchar(16) NULL,
+	bannedIpHostMask varchar(16) NULL,
+	bannedNameMask varchar(64) NULL
+	);
+
+INSERT INTO Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
+	SELECT EstateID, cast(bannedUUID as uuid), bannedIp, bannedIpHostMask, bannedNameMask FROM estateban ;
+
+DROP TABLE estateban;
+
+Alter table Tmp_estateban
+  rename to estateban;
+
+CREATE INDEX IX_estateban ON estateban
+	(
+	EstateID
+	);
+
+COMMIT;
+
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_settings
+	(
+	EstateID int NOT NULL,
+	EstateName varchar(64) NULL DEFAULT (NULL),
+	AbuseEmailToEstateOwner boolean NOT NULL,
+	DenyAnonymous boolean NOT NULL,
+	ResetHomeOnTeleport boolean NOT NULL,
+	FixedSun boolean NOT NULL,
+	DenyTransacted boolean NOT NULL,
+	BlockDwell boolean NOT NULL,
+	DenyIdentified boolean NOT NULL,
+	AllowVoice boolean NOT NULL,
+	UseGlobalTime boolean NOT NULL,
+	PricePerMeter int NOT NULL,
+	TaxFree boolean NOT NULL,
+	AllowDirectTeleport boolean NOT NULL,
+	RedirectGridX int NOT NULL,
+	RedirectGridY int NOT NULL,
+	ParentEstateID int NOT NULL,
+	SunPosition double precision NOT NULL,
+	EstateSkipScripts boolean NOT NULL,
+	BillableFactor double precision NOT NULL,
+	PublicAccess boolean NOT NULL,
+	AbuseEmail varchar(255) NOT NULL,
+	EstateOwner uuid NOT NULL,
+	DenyMinors boolean NOT NULL
+	);
+
+INSERT INTO Tmp_estate_settings (EstateID, EstateName, AbuseEmailToEstateOwner, DenyAnonymous, ResetHomeOnTeleport, FixedSun, DenyTransacted, BlockDwell, DenyIdentified, AllowVoice, UseGlobalTime, PricePerMeter, TaxFree, AllowDirectTeleport, RedirectGridX, RedirectGridY, ParentEstateID, SunPosition, EstateSkipScripts, BillableFactor, PublicAccess, AbuseEmail, EstateOwner, DenyMinors)
+	SELECT EstateID, EstateName, AbuseEmailToEstateOwner, DenyAnonymous, ResetHomeOnTeleport, FixedSun, DenyTransacted, BlockDwell, DenyIdentified, AllowVoice, UseGlobalTime, PricePerMeter, TaxFree, AllowDirectTeleport, RedirectGridX, RedirectGridY, ParentEstateID, SunPosition, EstateSkipScripts, BillableFactor, PublicAccess, AbuseEmail, cast(EstateOwner as uuid), DenyMinors FROM estate_settings ;
+
+DROP TABLE estate_settings;
+
+Alter table Tmp_estate_settings
+  rename to estate_settings;
+
+
+COMMIT;
+
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_estate_map
+	(
+	RegionID uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	EstateID int NOT NULL
+	);
+
+INSERT INTO Tmp_estate_map (RegionID, EstateID)
+	SELECT cast(RegionID as uuid), EstateID FROM estate_map ;
+
+DROP TABLE estate_map;
+
+Alter table Tmp_estate_map
+  rename to estate_map;
+
+COMMIT;
+
+
+
--- a/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
@@ -0,0 +1,42 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Friends (
+PrincipalID uuid NOT NULL, 
+Friend varchar(255) NOT NULL, 
+Flags char(16) NOT NULL DEFAULT '0',
+Offered varchar(32) NOT NULL DEFAULT 0);
+ 
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) 
+SELECT ownerID, friendID, friendPerms, 0 FROM userfriends;
+
+COMMIT;
+
+:VERSION 3 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_Friends
+	(PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 
+	Friend varchar(255) NOT NULL, 
+	Flags char(16) NOT NULL DEFAULT '0',
+	Offered varchar(32) NOT NULL DEFAULT 0) ;
+
+INSERT INTO Tmp_Friends (PrincipalID, Friend, Flags, Offered)
+	SELECT cast(PrincipalID as varchar(255)), Friend, Flags, Offered FROM Friends ;
+
+DROP TABLE Friends;
+
+Alter table Tmp_Friends
+  rename to Friends;
+
+
+COMMIT;
--- a/OpenSim/Data/PGSQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/GridStore.migrations
@@ -0,0 +1,242 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE regions(
+ regionHandle varchar(255) NULL,
+ regionName varchar(255) NULL,
+ uuid varchar(255) NOT NULL PRIMARY KEY,
+ regionRecvKey varchar(255) NULL,
+ regionSecret varchar(255) NULL,
+ regionSendKey varchar(255) NULL,
+ regionDataURI varchar(255) NULL,
+ serverIP varchar(255) NULL,
+ serverPort varchar(255) NULL,
+ serverURI varchar(255) NULL,
+ locX varchar(255) NULL,
+ locY varchar(255) NULL,
+ locZ varchar(255) NULL,
+ eastOverrideHandle varchar(255) NULL,
+ westOverrideHandle varchar(255) NULL,
+ southOverrideHandle varchar(255) NULL,
+ northOverrideHandle varchar(255) NULL,
+ regionAssetURI varchar(255) NULL,
+ regionAssetRecvKey varchar(255) NULL,
+ regionAssetSendKey varchar(255) NULL,
+ regionUserURI varchar(255) NULL,
+ regionUserRecvKey varchar(255) NULL,
+ regionUserSendKey varchar(255) NULL,
+ regionMapTexture varchar(255) NULL,
+ serverHttpPort varchar(255) NULL,
+ serverRemotingPort varchar(255) NULL,
+ owner_uuid varchar(36) NULL
+);
+
+COMMIT;
+
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regions
+	(
+	uuid varchar(36) NOT NULL,
+	regionHandle bigint NULL,
+	regionName varchar(20) NULL,
+	regionRecvKey varchar(128) NULL,
+	regionSendKey varchar(128) NULL,
+	regionSecret varchar(128) NULL,
+	regionDataURI varchar(128) NULL,
+	serverIP varchar(64) NULL,
+	serverPort int NULL,
+	serverURI varchar(255) NULL,
+	locX int NULL,
+	locY int NULL,
+	locZ int NULL,
+	eastOverrideHandle bigint NULL,
+	westOverrideHandle bigint NULL,
+	southOverrideHandle bigint NULL,
+	northOverrideHandle bigint NULL,
+	regionAssetURI varchar(255) NULL,
+	regionAssetRecvKey varchar(128) NULL,
+	regionAssetSendKey varchar(128) NULL,
+	regionUserURI varchar(255) NULL,
+	regionUserRecvKey varchar(128) NULL,
+	regionUserSendKey varchar(128) NULL,
+	regionMapTexture varchar(36) NULL,
+	serverHttpPort int NULL,
+	serverRemotingPort int NULL,
+	owner_uuid varchar(36) NULL,
+	originUUID varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+	);
+
+INSERT INTO Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid)
+	SELECT cast(uuid as varchar(36)), cast(regionHandle as bigint), cast(regionName as varchar(20)), cast(regionRecvKey as varchar(128)), cast(regionSendKey as varchar(128)), cast(regionSecret as varchar(128)), cast(regionDataURI as varchar(128)), cast(serverIP as varchar(64)), cast(serverPort as int), serverURI, cast(locX as int), cast(locY as int), cast(locZ as int), cast(eastOverrideHandle as bigint), cast(westOverrideHandle as bigint), 
+	      cast(southOverrideHandle as bigint), cast(northOverrideHandle as bigint), regionAssetURI, cast(regionAssetRecvKey as varchar(128)), cast(regionAssetSendKey as varchar(128)), regionUserURI, cast(regionUserRecvKey as varchar(128)), cast(regionUserSendKey as varchar(128)), cast(regionMapTexture as varchar(36)), 
+	      cast(serverHttpPort as int), cast(serverRemotingPort as int), owner_uuid 
+	      FROM regions;
+
+DROP TABLE regions;
+
+alter table Tmp_regions
+  rename to regions;
+
+COMMIT;
+
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	regionName
+	);
+
+CREATE INDEX IX_regions_handle ON regions
+	(
+	regionHandle
+	);
+
+
+CREATE INDEX IX_regions_override ON regions
+	(
+	eastOverrideHandle,
+	westOverrideHandle,
+	southOverrideHandle,
+	northOverrideHandle
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the cotext of the database designer.*/
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_regions
+	(
+	uuid uuid NOT NULL,
+	regionHandle bigint NULL,
+	regionName varchar(20) NULL,
+	regionRecvKey varchar(128) NULL,
+	regionSendKey varchar(128) NULL,
+	regionSecret varchar(128) NULL,
+	regionDataURI varchar(128) NULL,
+	serverIP varchar(64) NULL,
+	serverPort int NULL,
+	serverURI varchar(255) NULL,
+	locX int NULL,
+	locY int NULL,
+	locZ int NULL,
+	eastOverrideHandle bigint NULL,
+	westOverrideHandle bigint NULL,
+	southOverrideHandle bigint NULL,
+	northOverrideHandle bigint NULL,
+	regionAssetURI varchar(255) NULL,
+	regionAssetRecvKey varchar(128) NULL,
+	regionAssetSendKey varchar(128) NULL,
+	regionUserURI varchar(255) NULL,
+	regionUserRecvKey varchar(128) NULL,
+	regionUserSendKey varchar(128) NULL,
+	regionMapTexture uuid NULL,
+	serverHttpPort int NULL,
+	serverRemotingPort int NULL,
+	owner_uuid uuid NOT NULL,
+	originUUID uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+	);
+	
+
+INSERT INTO Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID)
+  SELECT cast(uuid as uuid), regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, cast(regionMapTexture as uuid), serverHttpPort, serverRemotingPort, cast( owner_uuid as uuid), cast(originUUID as uuid) FROM regions ;
+  
+
+DROP TABLE regions;
+
+alter table Tmp_regions rename to regions;
+
+ALTER TABLE regions ADD CONSTRAINT
+	PK__regions__uuid PRIMARY KEY 
+	(
+	uuid
+	);
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	regionName
+	);
+
+CREATE INDEX IX_regions_handle ON regions
+	(
+	regionHandle
+	);
+
+CREATE INDEX IX_regions_override ON regions
+	(
+	eastOverrideHandle,
+	westOverrideHandle,
+	southOverrideHandle,
+	northOverrideHandle
+	);
+
+COMMIT;
+
+
+:VERSION 5
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD access int default 0;
+
+COMMIT;
+
+
+:VERSION 6
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD scopeid uuid default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE regions alter column owner_uuid set DEFAULT ('00000000-0000-0000-0000-000000000000');
+ALTER TABLE regions ADD sizeX integer not null default 0;
+ALTER TABLE regions ADD sizeY integer not null default 0;
+
+COMMIT;
+
+
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD flags integer NOT NULL DEFAULT 0;
+CREATE INDEX flags ON regions(flags);
+ALTER TABLE regions ADD last_seen integer NOT NULL DEFAULT 0;
+ALTER TABLE regions ADD PrincipalID uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE regions ADD Token varchar(255) NOT NULL DEFAULT 0;
+
+COMMIT;
+
+:VERSION 8
+
+BEGIN TRANSACTION;
+ALTER TABLE regions ALTER COLUMN regionName type VarChar(128) ;
+
+DROP INDEX IX_regions_name;
+ALTER TABLE regions ALTER COLUMN regionName type VarChar(128),
+  ALTER COLUMN regionName SET NOT NULL;
+
+CREATE INDEX IX_regions_name ON regions
+	(
+	regionName
+	);
+
+COMMIT;
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+ALTER TABLE regions ADD parcelMapTexture uuid NULL;
+
+COMMIT;
+
--- a/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
@@ -0,0 +1,60 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE GridUser (
+    UserID VARCHAR(255) NOT NULL Primary Key,
+    HomeRegionID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    HomePosition CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    HomeLookAt CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    LastRegionID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    LastPosition CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    LastLookAt CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    Online CHAR(5) NOT NULL DEFAULT 'false',
+    Login CHAR(16) NOT NULL DEFAULT '0',
+    Logout CHAR(16) NOT NULL DEFAULT '0'
+) ;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN TRANSACTION;
+
+CREATE TABLE GridUser_tmp (
+    UserID VARCHAR(255) NOT NULL,
+    HomeRegionID uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    HomePosition CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    HomeLookAt CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    LastRegionID uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    LastPosition CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    LastLookAt CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    Online CHAR(5) NOT NULL DEFAULT 'false',
+    Login CHAR(16) NOT NULL DEFAULT '0',
+    Logout CHAR(16) NOT NULL DEFAULT '0'
+    );
+
+COMMIT;
+
+
+INSERT INTO GridUser_tmp (UserID
+           ,HomeRegionID
+           ,HomePosition
+           ,HomeLookAt
+           ,LastRegionID
+           ,LastPosition
+           ,LastLookAt
+           ,Online
+           ,Login
+           ,Logout)
+ SELECT UserID, cast(HomeRegionID as uuid), HomePosition ,HomeLookAt , cast(LastRegionID as uuid),
+       LastPosition
+      ,LastLookAt
+      ,Online
+      ,Login
+      ,Logout FROM GridUser;
+
+DROP TABLE GridUser;
+
+alter table GridUser_tmp rename to GridUser;
+
--- a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
@@ -0,0 +1,211 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE inventoryfolders (
+  folderID varchar(36) NOT NULL default '' PRIMARY KEY,
+  agentID varchar(36) default NULL,
+  parentFolderID varchar(36) default NULL,
+  folderName varchar(64) default NULL,
+  type smallint NOT NULL default 0,
+  version int NOT NULL default 0
+);
+
+
+CREATE INDEX owner ON inventoryfolders
+(
+	agentID ASC
+);
+
+CREATE INDEX parent ON inventoryfolders
+(
+	parentFolderID ASC
+);
+
+
+CREATE TABLE inventoryitems (
+  inventoryID varchar(36) NOT NULL default '' Primary Key,
+  assetID varchar(36) default NULL,
+  assetType int default NULL,
+  parentFolderID varchar(36) default NULL,
+  avatarID varchar(36) default NULL,
+  inventoryName varchar(64) default NULL,
+  inventoryDescription varchar(128) default NULL,
+  inventoryNextPermissions int default NULL,
+  inventoryCurrentPermissions int default NULL,
+  invType int default NULL,
+  creatorID varchar(36) default NULL,
+  inventoryBasePermissions int NOT NULL default 0,
+  inventoryEveryOnePermissions int NOT NULL default 0,
+  salePrice int default NULL,
+  saleType smallint default NULL,
+  creationDate int default NULL,
+  groupID varchar(36) default NULL,
+  groupOwned boolean default NULL,
+  flags int default NULL
+);
+
+
+CREATE INDEX ii_owner ON inventoryitems
+(
+	avatarID ASC
+);
+
+CREATE INDEX ii_folder ON inventoryitems
+(
+	parentFolderID ASC
+);
+
+COMMIT;
+
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+ALTER TABLE inventoryitems ADD inventoryGroupPermissions INTEGER NOT NULL default 0;
+
+COMMIT;
+
+:VERSION 3
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the cotext of the database designer.*/
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_inventoryfolders
+	(
+	folderID uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	agentID uuid NULL DEFAULT (NULL),
+	parentFolderID uuid NULL DEFAULT (NULL),
+	folderName varchar(64) NULL DEFAULT (NULL),
+	type smallint NOT NULL DEFAULT ((0)),
+	version int NOT NULL DEFAULT ((0))
+	);
+
+ INSERT INTO Tmp_inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version)
+   SELECT cast(folderID as uuid), cast(agentID as uuid), cast(parentFolderID as uuid), folderName, type, version 
+   FROM inventoryfolders;
+
+DROP TABLE inventoryfolders;
+
+alter table Tmp_inventoryfolders rename to inventoryfolders;
+
+ALTER TABLE inventoryfolders ADD CONSTRAINT
+	PK__inventor__C2FABFB3173876EA PRIMARY KEY 
+	(
+	folderID
+	);
+
+CREATE INDEX owner ON inventoryfolders
+	(
+	agentID
+	);
+
+CREATE INDEX parent ON inventoryfolders
+	(
+	parentFolderID
+	);
+
+COMMIT;
+
+
+:VERSION 4
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Tmp_inventoryitems
+	(
+	inventoryID uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	assetID uuid NULL DEFAULT (NULL),
+	assetType int NULL DEFAULT (NULL),
+	parentFolderID uuid NULL DEFAULT (NULL),
+	avatarID uuid NULL DEFAULT (NULL),
+	inventoryName varchar(64) NULL DEFAULT (NULL),
+	inventoryDescription varchar(128) NULL DEFAULT (NULL),
+	inventoryNextPermissions int NULL DEFAULT (NULL),
+	inventoryCurrentPermissions int NULL DEFAULT (NULL),
+	invType int NULL DEFAULT (NULL),
+	creatorID uuid NULL DEFAULT (NULL),
+	inventoryBasePermissions int NOT NULL DEFAULT ((0)),
+	inventoryEveryOnePermissions int NOT NULL DEFAULT ((0)),
+	salePrice int NULL DEFAULT (NULL),
+	saleType smallint NULL DEFAULT (NULL),
+	creationDate int NULL DEFAULT (NULL),
+	groupID uuid NULL DEFAULT (NULL),
+	groupOwned boolean NULL DEFAULT (NULL),
+	flags int NULL DEFAULT (NULL),
+	inventoryGroupPermissions int NOT NULL DEFAULT ((0))
+	);
+
+
+	 INSERT INTO Tmp_inventoryitems (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryGroupPermissions)
+		SELECT cast(inventoryID as uuid), cast(assetID as uuid), assetType, cast(parentFolderID as uuid), cast(avatarID as uuid), inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, cast(creatorID as uuid), inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, cast(groupID as uuid), groupOwned, flags, inventoryGroupPermissions 
+		FROM inventoryitems ;
+
+DROP TABLE inventoryitems;
+
+alter table Tmp_inventoryitems rename to inventoryitems;
+
+ALTER TABLE inventoryitems ADD CONSTRAINT
+	PK__inventor__C4B7BC2220C1E124 PRIMARY KEY 
+	(
+	inventoryID
+	);
+
+
+CREATE INDEX ii2_owner ON inventoryitems
+	(
+	avatarID
+	);
+
+CREATE INDEX ii2_folder ON inventoryitems
+	(
+	parentFolderID
+	);
+
+COMMIT;
+
+:VERSION 5
+
+
+BEGIN TRANSACTION;
+
+-- # Restoring defaults:   
+-- # NOTE: inventoryID does NOT need one: it's NOT NULL PK and a unique Guid must be provided every time anyway!
+ 
+alter table inventoryitems
+   alter column inventoryBasePermissions set default 0;    
+alter table inventoryitems
+   alter column inventoryEveryOnePermissions set default 0;  
+alter table inventoryitems
+   alter column inventoryGroupPermissions set default 0 ;   
+   
+COMMIT     ;
+   
+:VERSION 7
+
+BEGIN TRANSACTION;
+
+-- # CreatorID goes back to VARCHAR(36) (???)
+
+alter table inventoryitems
+  alter column CreatorID type varchar(36);
+
+COMMIT	;
+   
+:VERSION 8
+
+ALTER TABLE inventoryitems
+ alter column CreatorID set DEFAULT '00000000-0000-0000-0000-000000000000';
+   
+
+:VERSION 9
+
+BEGIN TRANSACTION;
+
+--# CreatorID goes up to VARCHAR(255)
+
+alter table inventoryitems
+  alter column CreatorID type varchar(255);
+  
+Commit;
--- a/OpenSim/Data/PGSQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/LogStore.migrations
@@ -0,0 +1,16 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE logs (
+  logID int NOT NULL Primary Key,
+  target varchar(36) default NULL,
+  server varchar(64) default NULL,
+  method varchar(64) default NULL,
+  arguments varchar(255) default NULL,
+  priority int default NULL,
+  message text
+);
+
+COMMIT;
+
--- a/OpenSim/Data/PGSQL/Resources/Presence.migrations
+++ b/OpenSim/Data/PGSQL/Resources/Presence.migrations
@@ -0,0 +1,30 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE Presence (
+UserID varchar(255) NOT NULL, 
+RegionID uuid NOT NULL, 
+SessionID uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+SecureSessionID uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
+);
+ 
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+ALTER TABLE Presence ADD LastSeen Timestamp
+
+COMMIT;
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations.sql
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations.sql
--- a/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
@@ -0,0 +1,55 @@
+:VERSION 1
+
+CREATE TABLE UserAccounts (
+  PrincipalID uniqueidentifier NOT NULL,
+  ScopeID uniqueidentifier NOT NULL,
+  FirstName varchar(64) NOT NULL,
+  LastName varchar(64) NOT NULL,
+  Email varchar(64) NULL,
+  ServiceURLs text NULL,
+  Created int default NULL,
+  
+  PRIMARY KEY
+(
+	PrincipalID ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+) ON PRIMARY
+
+
+:VERSION 2
+
+BEGIN TRANSACTION
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'users') AND type in (N'U'))
+INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT UUID AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
+username AS FirstName, 
+lastname AS LastName, 
+email as Email, (
+'AssetServerURI=' +  
+userAssetURI + ' InventoryServerURI='  + userInventoryURI + ' GatewayURI= HomeURI=') AS ServiceURLs, 
+created as Created FROM users;
+
+
+COMMIT
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
+CREATE INDEX Email ON UserAccounts(Email);
+CREATE INDEX FirstName ON UserAccounts(FirstName);
+CREATE INDEX LastName ON UserAccounts(LastName);
+CREATE INDEX Name ON UserAccounts(FirstName,LastName);
+
+COMMIT
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+ALTER TABLE UserAccounts ADD UserLevel integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD UserFlags integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD UserTitle varchar(64) NOT NULL DEFAULT '';
+
+COMMIT
+
--- a/OpenSim/Data/PGSQL/Resources/UserStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserStore.migrations
@@ -0,0 +1,421 @@
+:VERSION 1
+
+CREATE TABLE users (
+  UUID varchar(36) NOT NULL default '',
+  username varchar(32) NOT NULL,
+  lastname varchar(32) NOT NULL,
+  passwordHash varchar(32) NOT NULL,
+  passwordSalt varchar(32) NOT NULL,
+  homeRegion bigint default NULL,
+  homeLocationX double precision default NULL,
+  homeLocationY double precision default NULL,
+  homeLocationZ double precision default NULL,
+  homeLookAtX double precision default NULL,
+  homeLookAtY double precision default NULL,
+  homeLookAtZ double precision default NULL,
+  created int NOT NULL,
+  lastLogin int NOT NULL,
+  userInventoryURI varchar(255) default NULL,
+  userAssetURI varchar(255) default NULL,
+  profileCanDoMask int default NULL,
+  profileWantDoMask int default NULL,
+  profileAboutText text,
+  profileFirstText text,
+  profileImage varchar(36) default NULL,
+  profileFirstImage varchar(36) default NULL,
+  webLoginKey varchar(36) default NULL,
+  PRIMARY KEY
+(
+	UUID ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+) ON PRIMARY
+
+
+CREATE NONCLUSTERED INDEX usernames ON users
+(
+	username ASC,
+	lastname ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+
+
+CREATE TABLE agents (
+  UUID varchar(36) NOT NULL,
+  sessionID varchar(36) NOT NULL,
+  secureSessionID varchar(36) NOT NULL,
+  agentIP varchar(16) NOT NULL,
+  agentPort int NOT NULL,
+  agentOnline smallint NOT NULL,
+  loginTime int NOT NULL,
+  logoutTime int NOT NULL,
+  currentRegion varchar(36) NOT NULL,
+  currentHandle bigint NOT NULL,
+  currentPos varchar(64) NOT NULL,
+  PRIMARY KEY
+(
+	UUID ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+) ON PRIMARY
+
+
+CREATE NONCLUSTERED INDEX session ON agents
+(
+	sessionID ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX ssession ON agents
+(
+	secureSessionID ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+
+
+CREATE TABLE userfriends(
+	ownerID varchar(50) NOT NULL,
+	friendID varchar(50) NOT NULL,
+	friendPerms varchar(50)  NOT NULL,
+	datetimestamp varchar(50)  NOT NULL
+) ON PRIMARY
+
+CREATE TABLE avatarappearance  (
+  Owner  varchar(36) NOT NULL,
+  Serial  int NOT NULL,
+  Visual_Params bytea NOT NULL,
+  Texture bytea NOT NULL,
+  Avatar_Height double precision NOT NULL,
+  Body_Item varchar(36) NOT NULL,
+  Body_Asset varchar(36) NOT NULL,
+  Skin_Item varchar(36) NOT NULL,
+  Skin_Asset varchar(36) NOT NULL,
+  Hair_Item varchar(36) NOT NULL,
+  Hair_Asset varchar(36) NOT NULL,
+  Eyes_Item varchar(36) NOT NULL,
+  Eyes_Asset varchar(36) NOT NULL,
+  Shirt_Item varchar(36) NOT NULL,
+  Shirt_Asset varchar(36) NOT NULL,
+  Pants_Item varchar(36) NOT NULL,
+  Pants_Asset varchar(36) NOT NULL,
+  Shoes_Item varchar(36) NOT NULL,
+  Shoes_Asset varchar(36) NOT NULL,
+  Socks_Item varchar(36) NOT NULL,
+  Socks_Asset varchar(36) NOT NULL,
+  Jacket_Item varchar(36) NOT NULL,
+  Jacket_Asset varchar(36) NOT NULL,
+  Gloves_Item varchar(36) NOT NULL,
+  Gloves_Asset varchar(36) NOT NULL,
+  Undershirt_Item varchar(36) NOT NULL,
+  Undershirt_Asset varchar(36) NOT NULL,
+  Underpants_Item varchar(36) NOT NULL,
+  Underpants_Asset varchar(36) NOT NULL,
+  Skirt_Item varchar(36) NOT NULL,
+  Skirt_Asset varchar(36) NOT NULL,
+
+  PRIMARY KEY  (
+  Owner
+  ) WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON PRIMARY
+) ON PRIMARY
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE users ADD userFlags int NOT NULL default 0;
+ALTER TABLE users ADD godLevel int NOT NULL default 0;
+ALTER TABLE users ADD customType varchar(32) not null default '';
+ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT
+
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE avatarattachments (
+	UUID varchar(36) NOT NULL
+	, attachpoint int NOT NULL
+	, item varchar(36) NOT NULL
+	, asset varchar(36) NOT NULL)
+
+CREATE NONCLUSTERED INDEX IX_avatarattachments ON avatarattachments
+	(
+	UUID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+
+COMMIT
+
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_userfriends
+	(
+	ownerID varchar(36) NOT NULL,
+	friendID varchar(36) NOT NULL,
+	friendPerms int NOT NULL,
+	datetimestamp int NOT NULL
+	)  ON PRIMARY
+
+IF EXISTS(SELECT * FROM userfriends)
+	 EXEC('INSERT INTO Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
+		SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM userfriends WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE userfriends
+
+EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
+	(
+	ownerID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
+	(
+	friendID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 5
+
+BEGIN TRANSACTION
+
+ ALTER TABLE users add email varchar(250);
+ 
+COMMIT
+
+
+:VERSION 6
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_users
+	(
+	UUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	username varchar(32) NOT NULL,
+	lastname varchar(32) NOT NULL,
+	passwordHash varchar(32) NOT NULL,
+	passwordSalt varchar(32) NOT NULL,
+	homeRegion bigint NULL DEFAULT (NULL),
+	homeLocationX double precision(53) NULL DEFAULT (NULL),
+	homeLocationY double precision(53) NULL DEFAULT (NULL),
+	homeLocationZ double precision(53) NULL DEFAULT (NULL),
+	homeLookAtX double precision(53) NULL DEFAULT (NULL),
+	homeLookAtY double precision(53) NULL DEFAULT (NULL),
+	homeLookAtZ double precision(53) NULL DEFAULT (NULL),
+	created int NOT NULL,
+	lastLogin int NOT NULL,
+	userInventoryURI varchar(255) NULL DEFAULT (NULL),
+	userAssetURI varchar(255) NULL DEFAULT (NULL),
+	profileCanDoMask int NULL DEFAULT (NULL),
+	profileWantDoMask int NULL DEFAULT (NULL),
+	profileAboutText text NULL,
+	profileFirstText text NULL,
+	profileImage uniqueidentifier NULL DEFAULT (NULL),
+	profileFirstImage uniqueidentifier NULL DEFAULT (NULL),
+	webLoginKey uniqueidentifier NULL DEFAULT (NULL),
+	homeRegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	userFlags int NOT NULL DEFAULT ((0)),
+	godLevel int NOT NULL DEFAULT ((0)),
+	customType varchar(32) NOT NULL DEFAULT (''),
+	partner uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+	email varchar(250) NULL
+	)  ON PRIMARY
+	 TEXTIMAGE_ON PRIMARY
+
+IF EXISTS(SELECT * FROM users)
+	 EXEC('INSERT INTO Tmp_users (UUID, username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, profileImage, profileFirstImage, webLoginKey, homeRegionID, userFlags, godLevel, customType, partner, email)
+		SELECT CONVERT(uniqueidentifier, UUID), username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, CONVERT(uniqueidentifier, profileImage), CONVERT(uniqueidentifier, profileFirstImage), CONVERT(uniqueidentifier, webLoginKey), CONVERT(uniqueidentifier, homeRegionID), userFlags, godLevel, customType, CONVERT(uniqueidentifier, partner), email FROM users WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE users
+
+EXECUTE sp_rename N'Tmp_users', N'users', 'OBJECT' 
+
+ALTER TABLE users ADD CONSTRAINT
+	PK__users__65A475E737A5467C PRIMARY KEY 
+	(
+	UUID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX usernames ON users
+	(
+	username,
+	lastname
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 7
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_agents
+	(
+	UUID uniqueidentifier NOT NULL,
+	sessionID uniqueidentifier NOT NULL,
+	secureSessionID uniqueidentifier NOT NULL,
+	agentIP varchar(16) NOT NULL,
+	agentPort int NOT NULL,
+	agentOnline smallint NOT NULL,
+	loginTime int NOT NULL,
+	logoutTime int NOT NULL,
+	currentRegion uniqueidentifier NOT NULL,
+	currentHandle bigint NOT NULL,
+	currentPos varchar(64) NOT NULL
+	)  ON PRIMARY
+
+IF EXISTS(SELECT * FROM agents)
+	 EXEC('INSERT INTO Tmp_agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos)
+		SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, sessionID), CONVERT(uniqueidentifier, secureSessionID), agentIP, agentPort, agentOnline, loginTime, logoutTime, CONVERT(uniqueidentifier, currentRegion), currentHandle, currentPos FROM agents WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE agents
+
+EXECUTE sp_rename N'Tmp_agents', N'agents', 'OBJECT' 
+
+ALTER TABLE agents ADD CONSTRAINT
+	PK__agents__65A475E749C3F6B7 PRIMARY KEY 
+	(
+	UUID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX session ON agents
+	(
+	sessionID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX ssession ON agents
+	(
+	secureSessionID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 8
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_userfriends
+	(
+	ownerID uniqueidentifier NOT NULL,
+	friendID uniqueidentifier NOT NULL,
+	friendPerms int NOT NULL,
+	datetimestamp int NOT NULL
+	)  ON PRIMARY
+
+IF EXISTS(SELECT * FROM userfriends)
+	 EXEC('INSERT INTO Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
+		SELECT CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, friendID), friendPerms, datetimestamp FROM userfriends WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE userfriends
+
+EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
+	(
+	ownerID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
+	(
+	friendID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 9
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_avatarappearance
+	(
+	Owner uniqueidentifier NOT NULL,
+	Serial int NOT NULL,
+	Visual_Params bytea NOT NULL,
+	Texture bytea NOT NULL,
+	Avatar_Height double precision(53) NOT NULL,
+	Body_Item uniqueidentifier NOT NULL,
+	Body_Asset uniqueidentifier NOT NULL,
+	Skin_Item uniqueidentifier NOT NULL,
+	Skin_Asset uniqueidentifier NOT NULL,
+	Hair_Item uniqueidentifier NOT NULL,
+	Hair_Asset uniqueidentifier NOT NULL,
+	Eyes_Item uniqueidentifier NOT NULL,
+	Eyes_Asset uniqueidentifier NOT NULL,
+	Shirt_Item uniqueidentifier NOT NULL,
+	Shirt_Asset uniqueidentifier NOT NULL,
+	Pants_Item uniqueidentifier NOT NULL,
+	Pants_Asset uniqueidentifier NOT NULL,
+	Shoes_Item uniqueidentifier NOT NULL,
+	Shoes_Asset uniqueidentifier NOT NULL,
+	Socks_Item uniqueidentifier NOT NULL,
+	Socks_Asset uniqueidentifier NOT NULL,
+	Jacket_Item uniqueidentifier NOT NULL,
+	Jacket_Asset uniqueidentifier NOT NULL,
+	Gloves_Item uniqueidentifier NOT NULL,
+	Gloves_Asset uniqueidentifier NOT NULL,
+	Undershirt_Item uniqueidentifier NOT NULL,
+	Undershirt_Asset uniqueidentifier NOT NULL,
+	Underpants_Item uniqueidentifier NOT NULL,
+	Underpants_Asset uniqueidentifier NOT NULL,
+	Skirt_Item uniqueidentifier NOT NULL,
+	Skirt_Asset uniqueidentifier NOT NULL
+	)  ON PRIMARY
+	 TEXTIMAGE_ON PRIMARY
+
+IF EXISTS(SELECT * FROM avatarappearance)
+	 EXEC('INSERT INTO Tmp_avatarappearance (Owner, Serial, Visual_Params, Texture, Avatar_Height, Body_Item, Body_Asset, Skin_Item, Skin_Asset, Hair_Item, Hair_Asset, Eyes_Item, Eyes_Asset, Shirt_Item, Shirt_Asset, Pants_Item, Pants_Asset, Shoes_Item, Shoes_Asset, Socks_Item, Socks_Asset, Jacket_Item, Jacket_Asset, Gloves_Item, Gloves_Asset, Undershirt_Item, Undershirt_Asset, Underpants_Item, Underpants_Asset, Skirt_Item, Skirt_Asset)
+		SELECT CONVERT(uniqueidentifier, Owner), Serial, Visual_Params, Texture, Avatar_Height, CONVERT(uniqueidentifier, Body_Item), CONVERT(uniqueidentifier, Body_Asset), CONVERT(uniqueidentifier, Skin_Item), CONVERT(uniqueidentifier, Skin_Asset), CONVERT(uniqueidentifier, Hair_Item), CONVERT(uniqueidentifier, Hair_Asset), CONVERT(uniqueidentifier, Eyes_Item), CONVERT(uniqueidentifier, Eyes_Asset), CONVERT(uniqueidentifier, Shirt_Item), CONVERT(uniqueidentifier, Shirt_Asset), CONVERT(uniqueidentifier, Pants_Item), CONVERT(uniqueidentifier, Pants_Asset), CONVERT(uniqueidentifier, Shoes_Item), CONVERT(uniqueidentifier, Shoes_Asset), CONVERT(uniqueidentifier, Socks_Item), CONVERT(uniqueidentifier, Socks_Asset), CONVERT(uniqueidentifier, Jacket_Item), CONVERT(uniqueidentifier, Jacket_Asset), CONVERT(uniqueidentifier, Gloves_Item), CONVERT(uniqueidentifier, Gloves_Asset), CONVERT(uniqueidentifier, Undershirt_Item), CONVERT(uniqueidentifier, Undershirt_Asset), CONVERT(uniqueidentifier, Underpants_Item), CONVERT(uniqueidentifier, Underpants_Asset), CONVERT(uniqueidentifier, Skirt_Item), CONVERT(uniqueidentifier, Skirt_Asset) FROM avatarappearance WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE avatarappearance
+
+EXECUTE sp_rename N'Tmp_avatarappearance', N'avatarappearance', 'OBJECT' 
+
+ALTER TABLE avatarappearance ADD CONSTRAINT
+	PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY 
+	(
+	Owner
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 10
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_avatarattachments
+	(
+	UUID uniqueidentifier NOT NULL,
+	attachpoint int NOT NULL,
+	item uniqueidentifier NOT NULL,
+	asset uniqueidentifier NOT NULL
+	)  ON PRIMARY
+
+IF EXISTS(SELECT * FROM avatarattachments)
+	 EXEC('INSERT INTO Tmp_avatarattachments (UUID, attachpoint, item, asset)
+		SELECT CONVERT(uniqueidentifier, UUID), attachpoint, CONVERT(uniqueidentifier, item), CONVERT(uniqueidentifier, asset) FROM avatarattachments WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE avatarattachments
+
+EXECUTE sp_rename N'Tmp_avatarattachments', N'avatarattachments', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_avatarattachments ON avatarattachments
+	(
+	UUID
+	) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON PRIMARY
+
+COMMIT
+
+
+:VERSION 11
+
+BEGIN TRANSACTION
+
+ALTER TABLE users ADD scopeID uniqueidentifier not null default '00000000-0000-0000-0000-000000000000'
+
+COMMIT
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
--- a/ThirdPartyLicenses/Aurora-Sim.txt
+++ b/ThirdPartyLicenses/Aurora-Sim.txt
@@ -1,26 +1,26 @@
-/*
- * Copyright (c) Contributors, http://aurora-sim.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 Aurora-Sim 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.
- */
+/*
+ * Copyright (c) Contributors, http://aurora-sim.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 Aurora-Sim 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.
+ */
--- a/bin/Npgsql.dll
+++ b/bin/Npgsql.dll
--- a/bin/Npgsql.pdb
+++ b/bin/Npgsql.pdb
--- a/bin/Npgsql.xml
+++ b/bin/Npgsql.xml
--- a/bin/lib32/libopenjpeg-dotnet.so
+++ b/bin/lib32/libopenjpeg-dotnet.so
--- a/bin/lib32/libsqlite3_32.so
+++ b/bin/lib32/libsqlite3_32.so
--- a/bin/lib32/ode.dll
+++ b/bin/lib32/ode.dll
--- a/bin/lib32/sqlite3.dll
+++ b/bin/lib32/sqlite3.dll
--- a/bin/lib64/libopenjpeg-dotnet-x86_64.so
+++ b/bin/lib64/libopenjpeg-dotnet-x86_64.so
--- a/bin/lib64/libopenjpeg-dotnet.dylib
+++ b/bin/lib64/libopenjpeg-dotnet.dylib
--- a/bin/lib64/libsqlite3.dylib
+++ b/bin/lib64/libsqlite3.dylib
--- a/bin/lib64/libsqlite3_64.so
+++ b/bin/lib64/libsqlite3_64.so
--- a/bin/lib64/ode.dll
+++ b/bin/lib64/ode.dll
--- a/bin/lib64/sqlite3.dll
+++ b/bin/lib64/sqlite3.dll
--- a/bin/openmetaverse_data/avatar_lad.xml
+++ b/bin/openmetaverse_data/avatar_lad.xml
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2073,6 +2073,41 @@
      </Files>
    </Project>

+    <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+      <Reference name="Npgsql" path="../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+      </Files>
+    </Project>
+	
    <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
      <Configuration name="Debug">
        <Options>
--- a/syncneb.bat
+++ b/syncneb.bat
@@ -0,0 +1,7 @@
+rem git remote add upstream https://github.com/nebadon2025/opensimulator.git
+
+git fetch upstream
+
+git merge upstream/master
+
+pause
Author	SHA1	Message	Date
Fernando Oliveira	91281b2b0b	PostgreSQL dll binarie and RegionStore.migrations.sql conversion	2013-09-15 22:31:09 -03:00
Fernando Oliveira	acce61c48f	PostgreSQL data access implementation	2013-09-15 22:16:14 -03:00
Fernando Oliveira	8b096d9ad8	Merge remote-tracking branch 'upstream/master'	2013-09-13 20:41:14 -03:00
Fernando Oliveira	e8272ab138	First commit - converting from mysql	2013-07-04 17:52:43 -03:00
Fernando Oliveira	98cef2a961	sincronização com master remoto	2013-07-04 14:59:26 -03:00
Fernando Oliveira	2d065bd327	Merge branch 'master' of https://github.com/ffoliveira/opensimulator Conflicts: CONTRIBUTORS.txt OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Framework/Monitoring/MemoryWatchdog.cs OpenSim/Framework/Servers/MainServer.cs OpenSim/Framework/Util.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Sound/SoundModule.cs OpenSim/Region/Framework/Interfaces/ISoundModule.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.dll.config	2013-07-04 14:55:49 -03:00
Fernando Oliveira	81c484d713	Merge branch 'master' of https://github.com/nebadon2025/opensimulator Conflicts: OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs OpenSim/ApplicationPlugins/Rest/RestPlugin.cs OpenSim/Capabilities/Handlers/Properties/AssemblyInfo.cs OpenSim/Capabilities/Properties/AssemblyInfo.cs OpenSim/ConsoleClient/Properties/AssemblyInfo.cs OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs OpenSim/Data/MySQL/Properties/AssemblyInfo.cs OpenSim/Data/Null/Properties/AssemblyInfo.cs OpenSim/Data/Properties/AssemblyInfo.cs OpenSim/Data/SQLite/Properties/AssemblyInfo.cs OpenSim/Framework/AssemblyInfo.cs OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs OpenSim/Framework/Communications/Properties/AssemblyInfo.cs OpenSim/Framework/Configuration/HTTP/Properties/AssemblyInfo.cs OpenSim/Framework/Configuration/XML/Properties/AssemblyInfo.cs OpenSim/Framework/Console/AssemblyInfo.cs OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs OpenSim/Framework/Monitoring/Stats/Stat.cs OpenSim/Framework/Monitoring/StatsManager.cs OpenSim/Framework/RegionLoader/Filesystem/Properties/AssemblyInfo.cs OpenSim/Framework/RegionLoader/Web/Properties/AssemblyInfo.cs OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs OpenSim/Framework/Servers/Properties/AssemblyInfo.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ClientStack/Linden/Caps/Properties/AssemblyInfo.cs OpenSim/Region/ClientStack/Linden/UDP/Properties/AssemblyInfo.cs OpenSim/Region/ClientStack/Properties/AssemblyInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/DataSnapshot/DataSnapshotManager.cs OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs OpenSim/Region/Framework/Properties/AssemblyInfo.cs OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneManager.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs OpenSim/Region/Physics/BulletSPlugin/BS6DofConstraint.cs OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs OpenSim/Region/Physics/BulletSPlugin/BSScene.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/Physics/Manager/AssemblyInfo.cs OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs OpenSim/Server/Base/Properties/AssemblyInfo.cs OpenSim/Server/Base/ServicesServerBase.cs OpenSim/Server/Handlers/Properties/AssemblyInfo.cs OpenSim/Server/Properties/AssemblyInfo.cs OpenSim/Services/AssetService/Properties/AssemblyInfo.cs OpenSim/Services/AssetService/XAssetService.cs OpenSim/Services/AuthenticationService/Properties/AssemblyInfo.cs OpenSim/Services/AuthorizationService/Properties/AssemblyInfo.cs OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs OpenSim/Services/Base/Properties/AssemblyInfo.cs OpenSim/Services/Connectors/Properties/AssemblyInfo.cs OpenSim/Services/FreeswitchService/Properties/AssemblyInfo.cs OpenSim/Services/Friends/Properties/AssemblyInfo.cs OpenSim/Services/GridService/Properties/AssemblyInfo.cs OpenSim/Services/HypergridService/Properties/AssemblyInfo.cs OpenSim/Services/HypergridService/UserAgentService.cs OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs OpenSim/Services/InventoryService/Properties/AssemblyInfo.cs OpenSim/Services/LLLoginService/Properties/AssemblyInfo.cs OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs OpenSim/Services/UserAccountService/Properties/AssemblyInfo.cs OpenSim/Tests/Common/Helpers/SceneHelpers.cs OpenSim/Tests/Common/Mock/TestScene.cs OpenSim/Tools/Compiler/Properties/AssemblyInfo.cs OpenSim/Tools/Configger/Properties/AssemblyInfo.cs OpenSim/Tools/pCampBot/Properties/AssemblyInfo.cs ThirdParty/SmartThreadPool/AssemblyInfo.cs bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll bin/OpenSim.ini.example bin/OpenSimDefaults.ini bin/Robust.HG.ini.example bin/Robust.ini.example bin/config-include/StandaloneCommon.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so prebuild.xml	2013-04-17 23:41:43 -03:00
Fernando Oliveira	335687c846	Merge branch 'master' of https://github.com/ffoliveira/opensimulator Conflicts: .gitignore OpenSim/Data/IXGroupData.cs OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs	2013-03-14 23:53:10 -03:00
Fernando Oliveira	cdbf39ddba	Added MySQL/MySQLXGroupData.cs	2013-01-17 16:55:40 -02:00
Fernando Oliveira	269e20ca11	Rolled back to the nebadon source	2013-01-17 14:03:14 -02:00
Fernando Oliveira	0bcd3860cf	Merge branch 'master' of https://github.com/ffoliveira/opensimulator Conflicts: OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs	2013-01-17 11:44:07 -02:00
Fernando Oliveira	94b5ea1b5a	Merge remote-tracking branch 'upstream/master' Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs	2013-01-17 11:41:46 -02:00
Fernando Oliveira	9106d82382	Merge remote-tracking branch 'upstream/master' Conflicts: .gitignore OpenSim/Framework/Console/ConsoleUtil.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs OpenSim/Region/CoreModules/World/Sound/SoundModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs OpenSim/Region/Physics/BulletSPlugin/BS6DofConstraint.cs OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs OpenSim/Region/Physics/BulletSPlugin/BSHingeConstraint.cs OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs OpenSim/Region/Physics/BulletSPlugin/BSMaterials.cs OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs OpenSim/Region/Physics/BulletSPlugin/BSScene.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs OpenSim/Region/UserStatistics/WebStatsModule.cs OpenSim/Server/Base/ServicesServerBase.cs OpenSim/Server/ServerMain.cs bin/OpenMetaverse.dll.config bin/OpenSim.ini.example bin/OpenSimDefaults.ini bin/Robust.HG.ini.example bin/Robust.ini.example bin/config-include/GridCommon.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so	2013-01-16 23:08:55 -02:00
Fernando Oliveira	5d3d600b2e	Merge remote-tracking branch 'upstream/master' Conflicts: OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs	2013-01-16 22:15:01 -02:00
Fernando Oliveira	31a43c7fbc	Merge remote-tracking branch 'upstream/master'	2012-09-18 00:45:31 -03:00
Fernando Oliveira	82fd8c46ea	Merge remote-tracking branch 'upstream/master' Conflicts: OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs	2012-09-15 14:20:33 -03:00
Fernando Oliveira	0ce8a5f76a	added PostGreSQL support	2012-09-15 13:38:19 -03:00
Fernando Oliveira	34114c4e28	Merge remote-tracking branch 'upstream/master'	2012-08-19 22:59:24 -03:00
Fernando Oliveira	f839385af9	Merge remote-tracking branch 'upstream/master'	2012-05-03 20:11:24 -03:00
Fernando Oliveira	a6bce45692	Merge remote-tracking branch 'upstream/master'	2012-05-02 20:52:41 -03:00
Fernando Oliveira	7615d12148	Merge remote-tracking branch 'upstream/master'	2012-04-29 13:32:32 -03:00
Fernando Oliveira	0365fec926	Merge remote-tracking branch 'upstream/master'	2012-04-19 23:09:07 -03:00
Fernando Oliveira	53d21bcb50	Merge remote-tracking branch 'upstream/master'	2012-04-17 23:59:40 -03:00
Fernando Oliveira	c45392c17e	Merge remote-tracking branch 'upstream/master'	2012-04-01 23:23:42 -03:00
Fernando Oliveira	7ac437987a	Merge branch 'master' of https://github.com/ffoliveira/opensimulator Conflicts: bin/lib32/BulletSim.dll bin/lib64/BulletSim.dll	2012-03-30 00:52:48 -03:00
Fernando Oliveira	9e17b07e8b	Merge remote-tracking branch 'upstream/master'	2012-03-30 00:47:21 -03:00
Fernando Oliveira	8600ea2763	Merge branch 'master' into myideas	2012-03-27 00:45:13 -03:00
Fernando Oliveira	cd6fe5c4e6	Merge remote-tracking branch 'upstream/master'	2012-03-25 20:16:27 -03:00
Fernando Oliveira	64884bf65c	Merge remote-tracking branch 'upstream/master'	2012-03-24 00:25:01 -03:00
Fernando Oliveira	c01db95f48	Merge remote-tracking branch 'remotes/upstream/master' into myideas Started to implement GetEmptyCoordinates	2012-03-15 01:33:41 -03:00
Fernando Oliveira	3fbadb79ba	Merge branch 'master' of https://github.com/ffoliveira/opensimulator Conflicts: OpenSim/Region/Application/OpenSimBase.cs bin/OpenSim.ini.example	2012-03-10 20:40:26 -03:00
Fernando Oliveira	6eeba80d2a	Merge remote-tracking branch 'upstream/master'	2012-03-10 20:31:40 -03:00
Fernando Oliveira	04431fcb01	Merge remote-tracking branch 'upstream/master' Conflicts: OpenSim/Region/Application/OpenSimBase.cs bin/OpenSim.ini.example	2012-03-10 20:31:30 -03:00
Fernando Oliveira	bbe9af5576	Merge remote-tracking branch 'upstream/master' Conflicts: OpenSim/Region/Application/OpenSimBase.cs bin/OpenSim.ini.example	2012-03-10 00:34:16 -03:00
Fernando Oliveira	6b4e4da89e	Merge remote-tracking branch 'upstream/master'	2012-03-09 20:14:39 -03:00
Fernando Oliveira	b6e963c830	Merge branch 'master' of https://github.com/ffoliveira/opensimulator	2012-03-09 20:11:24 -03:00
Fernando Oliveira	8ea08cf4b4	merge changes from opensim	2012-03-09 20:11:02 -03:00
Fernando Oliveira	d92fc1dfb3	merge changes from opensim	2012-03-09 20:09:13 -03:00
Fernando Oliveira	83c018ebcd	Merge remote-tracking branch 'upstream/master' Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs	2012-03-06 23:32:20 -03:00
Fernando Oliveira	cf763b8306	Merge remote-tracking branch 'upstream/master'	2012-02-29 23:09:00 -03:00
Fernando Oliveira	5cda6ab754	Merge remote-tracking branch 'upstream/master'	2012-02-25 00:48:11 -02:00
Fernando Oliveira	6f6e05d775	Optimizations on osSetDynamicTextureURL function to reduce memory leak	2012-02-24 01:29:18 -02:00
Fernando Oliveira	c07fdc6ac4	Merge remote-tracking branch 'upstream/master'	2012-02-23 13:21:14 -02:00
Fernando Oliveira	2e6f5f6bcd	Changed the Estate first letter keys to uppercase	2012-02-23 13:16:47 -02:00
Fernando Oliveira	705b3fe414	Merge remote-tracking branch 'upstream/master'	2012-02-20 22:53:27 -02:00
Fernando Oliveira	55aaea8b91	Just added Maptile default to UUID.Zero	2012-02-20 22:53:22 -02:00
Fernando Oliveira	f4e32350ed	Changed back to generate maptiles when there are no MaptileStaticUUID at regions.ini	2012-02-15 15:55:02 -02:00
Fernando Oliveira	58f5e4b47a	Merge branch 'master' of https://github.com/ffoliveira/opensimulator	2012-02-15 02:04:58 -02:00
Fernando Oliveira	ddacc87617	Implemented different MapTile for each region in Regions.ini using MaptileStaticUUID key OpenSim.ini MaptileStaticUUID still work for default regions Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>	2012-02-15 02:03:32 -02:00
Fernando Oliveira	c5d1d6c47b	Implemented different MapTile for each region in Regions.ini using MaptileStaticUUID key OpenSim.ini MaptileStaticUUID still work for default regions Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>	2012-02-15 01:35:49 -02:00
Fernando Oliveira	23ebe65add	Merge remote-tracking branch 'upstream/master'	2012-02-15 00:28:22 -02:00
Fernando Oliveira	c611966828	try to configure maptile for each region	2012-02-15 00:27:10 -02:00
Fernando Oliveira	b9fa9a801e	Added Log to Maptile from Regions.ini	2012-02-10 01:55:08 -02:00
Fernando Oliveira	ec38593674	Put MaptileStaticUUID also in Regions.Ini file - as an alternative to MapTile by region	2012-02-10 00:17:34 -02:00
Fernando Oliveira	f018047460	Merge branch 'master' of https://github.com/ffoliveira/opensimulator	2012-02-09 22:34:38 -02:00
Fernando Oliveira	60a0395837	sync and merge source code from nebadom repo	2012-02-09 22:05:59 -02:00
Fernando Oliveira	d27ed42897	Merge remote-tracking branch 'upstream/master'	2012-02-09 22:00:26 -02:00
Fernando Oliveira	8bdc238ca4	Automatic empty coordinates attribution at sim creation	2012-02-09 21:56:24 -02:00
root	6903b60a0f	Merge remote-tracking branch 'upstream/master'	2012-02-02 13:19:56 -05:00
Fernando Oliveira	46dec8666c	New methods to get empty coordinates from the server	2012-01-23 16:11:42 -02:00
Fernando Oliveira	352774d5bf	Merge remote-tracking branch 'remotes/upstream/master'	2012-01-22 16:04:22 -02:00
Fernando Oliveira	34c0bd212a	Moved the EstateName and EstateOwner to OpenSim.ini at EstateDefaults entry To be used only on first time Estate Creation Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>	2012-01-22 02:04:10 -02:00
Fernando Oliveira	3032b49ec4	Changed to Auto Create a Sim at first time using the Regions.ini files Master Avatar and Estate keys	2012-01-21 19:08:04 -02:00