41 files changed, 7536 insertions, 1029 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
new file mode 100644
index 0000000..20612fe
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
@@ -0,0 +1,64 @@
+/*
+ * 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 Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLAgentPreferencesData : PGSQLGenericTableHandler<AgentPreferencesData>, IAgentPreferencesData
+    {
+        public PGSQLAgentPreferencesData(string connectionString, string realm)
+            : base(connectionString, realm, "AgentPrefs")
+        {
+        }
+        public AgentPreferencesData GetPrefs(UUID agentID)
+        {
+            // Until someone sends in a table that works
+            return null;
+            //AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
+            //if (ret.Length == 0)
+            //    return null;
+            //return ret[0];
+        }
+        public override bool Store(AgentPreferencesData row)
+        {
+            // Until someone sends in a table that works
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
index c7488d8..5d8b0a2 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -27,19 +27,20 @@
 using System;
 using System.Data;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Collections.Generic;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
+using Npgsql;
+using NpgsqlTypes;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL Interface for the Asset server
+    /// A PGSQL Interface for the Asset server
    /// </summary>
-    public class MSSQLAssetData : AssetDataBase
+    public class PGSQLAssetData : AssetDataBase
    {
        private const string _migrationStore = "AssetStore";
@@ -48,9 +49,14 @@ namespace OpenSim.Data.MSSQL
        /// <summary>
        /// Database manager
        /// </summary>
-        private MSSQLManager m_database;
+        private PGSQLManager m_database;
        private string m_connectionString;
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
        #region IPlugin Members
        override public void Dispose() { }
@@ -61,7 +67,7 @@ namespace OpenSim.Data.MSSQL
        // [Obsolete("Cannot be default-initialized!")]
        override public void Initialise()
        {
-            m_log.Info("[MSSQLAssetData]: " + Name + " cannot be default-initialized!");
+            m_log.Info("[PGSQLAssetData]: " + Name + " cannot be default-initialized!");
            throw new PluginNotInitialisedException(Name);
        }
@@ -76,7 +82,7 @@ namespace OpenSim.Data.MSSQL
        {
            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
-            m_database = new MSSQLManager(connectionString);
+            m_database = new PGSQLManager(connectionString);
            m_connectionString = connectionString;
            //New migration to check for DB changes
@@ -96,7 +102,7 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        override public string Name
        {
-            get { return "MSSQL Asset storage engine"; }
+            get { return "PGSQL Asset storage engine"; }
        }
        #endregion
@@ -110,13 +116,13 @@ namespace OpenSim.Data.MSSQL
        /// <returns></returns>
        override public AssetBase GetAsset(UUID assetID)
        {
-            string sql = "SELECT * FROM assets WHERE id = @id";
+            string sql = "SELECT * FROM assets WHERE id = :id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -147,34 +153,38 @@ namespace OpenSim.Data.MSSQL
        {
           
            string sql =
-                @"IF EXISTS(SELECT * FROM assets WHERE id=@id) 
+                @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType,
-                    UPDATE assets set name = @name, description = @description, assetType = @assetType,
+                         local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
-                            local = @local, temporary = @temporary, creatorid = @creatorid, data = @data
+                    WHERE id=:id;
-                           WHERE id=@id
-                   ELSE
+                  INSERT INTO assets
-                    INSERT INTO assets
+                    (id, name, description, " + "\"assetType\" " + @", local, 
-                    ([id], [name], [description], [assetType], [local], 
+                     temporary, create_time, access_time, creatorid, asset_flags, data)
-                     [temporary], [create_time], [access_time], [creatorid], [asset_flags], [data])
+                  Select :id, :name, :description, :assetType, :local, 
-                    VALUES
+                         :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
-                    (@id, @name, @description, @assetType, @local, 
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
-                     @temporary, @create_time, @access_time, @creatorid, @asset_flags, @data)";
+                ";
            
            string assetName = asset.Name;
-            if (asset.Name.Length > 64)
+            if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
            {
-                assetName = asset.Name.Substring(0, 64);
+                assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
-                m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                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)
+            if (asset.Description.Length > AssetBase.MAX_ASSET_DESC)
            {
-                assetDescription = asset.Description.Substring(0, 64);
+                assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
-                m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                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 (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            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));
@@ -195,7 +205,7 @@ namespace OpenSim.Data.MSSQL
                }
                catch(Exception e)
                {
-                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
+                    m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
                }
            }
        }
@@ -204,11 +214,11 @@ namespace OpenSim.Data.MSSQL
 // 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"))
+//            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(":id", asset.FullID.ToString());
-//                cmd.Parameters.AddWithValue("@access_time", now);
+//                cmd.Parameters.AddWithValue(":access_time", now);
 //                try
 //                {
 //                    cmd.ExecuteNonQuery();
@@ -221,17 +231,38 @@ namespace OpenSim.Data.MSSQL
 //        }
        /// <summary>
-        /// Check if asset exist in m_database
+        /// Check if the assets exist in the database.
        /// </summary>
-        /// <param name="uuid"></param>
+        /// <param name="uuids">The assets' IDs</param>
-        /// <returns>true if exist.</returns>
+        /// <returns>For each asset: true if it exists, false otherwise</returns>
-        override public bool ExistsAsset(UUID uuid)
+        public override bool[] AssetsExist(UUID[] uuids)
        {
-            if (GetAsset(uuid) != null)
+            if (uuids.Length == 0)
+                return new bool[0];
+            HashSet<UUID> exist = new HashSet<UUID>();
+            string ids = "'" + string.Join("','", uuids) + "'";
+            string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                return true;
+                conn.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                {
+                    while (reader.Read())
+                    {
+                        UUID id = DBGuid.FromDB(reader["id"]);
+                        exist.Add(id);
+                    }
+                }
            }
-            return false;
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = exist.Contains(uuids[i]);
+            return results;
        }
        /// <summary>
@@ -245,23 +276,19 @@ namespace OpenSim.Data.MSSQL
        public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
        {
            List<AssetMetadata> retList = new List<AssetMetadata>(count);
-            string sql = @"WITH OrderedAssets AS
+            string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid
-                (
+                              FROM assets 
-                    SELECT id, name, description, assetType, temporary, creatorid,
+                             order by id
-                    RowNumber = ROW_NUMBER() OVER (ORDER BY id)
+                             limit :stop
-                    FROM assets 
+                            offset :start;";
-                ) 
-                SELECT * 
-                FROM OrderedAssets
-                WHERE RowNumber BETWEEN @start AND @stop;";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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 (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    while (reader.Read())
                    {
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
index 1ae78c4..d174112 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -28,32 +28,38 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLAuthenticationData : IAuthenticationData
+    public class PGSQLAuthenticationData : IAuthenticationData
    {
        private string m_Realm;
        private List<string> m_ColumnNames = null;
        private int m_LastExpire = 0;
        private string m_ConnectionString;
-        private MSSQLManager m_database;
+        private PGSQLManager m_database;
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
-        public MSSQLAuthenticationData(string connectionString, string realm)
+        public PGSQLAuthenticationData(string connectionString, string realm)
        {
            m_Realm = realm;
            m_ConnectionString = connectionString;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
                conn.Open();
                Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
-                m_database = new MSSQLManager(m_ConnectionString);
+                m_database = new PGSQLManager(m_ConnectionString);
                m.Update();
            }
        }
@@ -63,14 +69,14 @@ namespace OpenSim.Data.MSSQL
            AuthenticationData ret = new AuthenticationData();
            ret.Data = new Dictionary<string, object>();
-            string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
+            string sql = string.Format("select * from {0} where uuid = :principalID", m_Realm);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
                {
                    if (result.Read())
                    {
@@ -87,7 +93,7 @@ namespace OpenSim.Data.MSSQL
                        foreach (string s in m_ColumnNames)
                        {
-                            if (s == "UUID")
+                            if (s == "UUID"||s == "uuid")
                                continue;
                            ret.Data[s] = result[s].ToString();
@@ -103,12 +109,31 @@ namespace OpenSim.Data.MSSQL
        {
            if (data.Data.ContainsKey("UUID"))
                data.Data.Remove("UUID");
+            if (data.Data.ContainsKey("uuid"))
+                data.Data.Remove("uuid");
+            /*
+            Dictionary<string, object> oAuth = new Dictionary<string, object>();
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (oDado.Key != oDado.Key.ToLower())
+                {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (!oAuth.ContainsKey(oDado.Key.ToLower())) {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            */
            string[] fields = new List<string>(data.Data.Keys).ToArray();
            StringBuilder updateBuilder = new StringBuilder();
-           
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
                updateBuilder.AppendFormat("update {0} set ", m_Realm);
@@ -117,27 +142,28 @@ namespace OpenSim.Data.MSSQL
                {
                    if (!first)
                        updateBuilder.Append(", ");
-                    updateBuilder.AppendFormat("{0} = @{0}",field);
+                    updateBuilder.AppendFormat("\"{0}\" = :{0}",field);
                    first = false;
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+                    
+                    cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
                }
-                updateBuilder.Append(" where UUID = @principalID");
+                updateBuilder.Append(" where uuid = :principalID");
                cmd.CommandText = updateBuilder.ToString();
                cmd.Connection = conn;
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
+                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.AppendFormat("insert into {0} (uuid, \"", m_Realm);
-                    insertBuilder.Append(String.Join(", ", fields));
+                    insertBuilder.Append(String.Join("\", \"", fields));
-                    insertBuilder.Append(") values (@principalID, @");
+                    insertBuilder.Append("\") values (:principalID, :");
-                    insertBuilder.Append(String.Join(", @", fields));
+                    insertBuilder.Append(String.Join(", :", fields));
                    insertBuilder.Append(")");
                    cmd.CommandText = insertBuilder.ToString();
@@ -153,11 +179,11 @@ namespace OpenSim.Data.MSSQL
        public bool SetDataItem(UUID principalID, string item, string value)
        {
-            string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
+            string sql = string.Format("update {0} set {1} = :{1} where uuid = :UUID", m_Realm, item);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
                    return true;
@@ -170,13 +196,13 @@ namespace OpenSim.Data.MSSQL
            if (System.Environment.TickCount - m_LastExpire > 30000)
                DoExpire();
            
-            string sql = "insert into tokens (UUID, token, validity) values (@principalID, @token, @lifetime)";
+            string sql = "insert into tokens (uuid, token, validity) values (:principalID, :token, :lifetime)";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", DateTime.Now.AddMinutes(lifetime)));
+                cmd.Parameters.Add(m_database.CreateParameter("lifetime", DateTime.Now.AddMinutes(lifetime)));
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
@@ -193,13 +219,14 @@ namespace OpenSim.Data.MSSQL
                DoExpire();
            DateTime validDate = DateTime.Now.AddMinutes(lifetime);
-            string sql = "update tokens set validity = @validDate where UUID = @principalID and token = @token and validity > GetDate()";
+            string sql = "update tokens set validity = :validDate where uuid = :principalID and token = :token and validity > (CURRENT_DATE + CURRENT_TIME)";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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("principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@validDate", validDate));
+                cmd.Parameters.Add(m_database.CreateParameter("validDate", validDate));
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
@@ -213,12 +240,12 @@ namespace OpenSim.Data.MSSQL
        private void DoExpire()
        {
            DateTime currentDateTime = DateTime.Now;
-            string sql = "delete from tokens where validity < @currentDateTime";
+            string sql = "delete from tokens where validity < :currentDateTime";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                conn.Open();
-                cmd.Parameters.Add(m_database.CreateParameter("@currentDateTime", currentDateTime));
+                cmd.Parameters.Add(m_database.CreateParameter("currentDateTime", currentDateTime));
                cmd.ExecuteNonQuery();
            }
            m_LastExpire = System.Environment.TickCount;
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
index 301b424..d9c4905 100644
--- a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
@@ -27,38 +27,39 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Reflection;
 using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
+using Npgsql;
+using NpgsqlTypes;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL Interface for Avatar Storage
+    /// A PGSQL Interface for Avatar Storage
    /// </summary>
-    public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>,
+    public class PGSQLAvatarData : PGSQLGenericTableHandler<AvatarBaseData>,
            IAvatarData
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
-        public MSSQLAvatarData(string connectionString, string realm) :
+        public PGSQLAvatarData(string connectionString, string realm) :
                base(connectionString, realm, "Avatar")
        {
        }
        public bool Delete(UUID principalID, string name)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
-                cmd.CommandText = String.Format("DELETE FROM {0} where [PrincipalID] = @PrincipalID and [Name] = @Name", m_Realm);
+                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("PrincipalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@Name", name));
+                cmd.Parameters.Add(m_database.CreateParameter("Name", name));
                cmd.Connection = conn;
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 1faa249..b5ca235 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -27,38 +27,44 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
 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.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLEstateStore : IEstateDataStore
+    public class PGSQLEstateStore : IEstateDataStore
    {
        private const string _migrationStore = "EstateStore";
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private MSSQLManager _Database;
+        private PGSQLManager _Database;
        private string m_connectionString;
        private FieldInfo[] _Fields;
        private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
        #region Public methods
-        public MSSQLEstateStore()
+        public PGSQLEstateStore()
        {
        }
-        public MSSQLEstateStore(string connectionString)
+        public PGSQLEstateStore(string connectionString)
        {
            Initialise(connectionString);
        }
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
        /// <summary>
        /// Initialises the estatedata class.
        /// </summary>
@@ -68,11 +74,11 @@ namespace OpenSim.Data.MSSQL
            if (!string.IsNullOrEmpty(connectionString))
            {
                m_connectionString = connectionString;
-                _Database = new MSSQLManager(connectionString);
+                _Database = new PGSQLManager(connectionString);
            }
            //Migration settings
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
                Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
@@ -101,15 +107,17 @@ namespace OpenSim.Data.MSSQL
        {
            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";
+            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 (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID));
+                cmd.Parameters.Add(_Database.CreateParameter("RegionID", regionID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -119,11 +127,15 @@ namespace OpenSim.Data.MSSQL
                            object v = reader[name];
                            if (f.FieldType == typeof(bool))
                            {
-                                f.SetValue(es, Convert.ToInt32(v) != 0);
+                                f.SetValue(es, v);
                            }
                            else if (f.FieldType == typeof(UUID))
                            {
-                                f.SetValue(es, new UUID((Guid)v)); // uuid);
+                                UUID estUUID = UUID.Zero;
+                                UUID.TryParse(v.ToString(), out estUUID);
+                                f.SetValue(es, estUUID);
                            }
                            else if (f.FieldType == typeof(string))
                            {
@@ -187,25 +199,37 @@ namespace OpenSim.Data.MSSQL
            names.Remove("EstateID");
-            string sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
+            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 (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn))
-            using (SqlCommand insertCommand = new SqlCommand(sql, conn))
            {
-                insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
+                insertCommand.CommandText = sql;
                foreach (string name in names)
                {
-                    insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
+                    insertCommand.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
                }
-                SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
+                //NpgsqlParameter idParameter = new NpgsqlParameter("ID", SqlDbType.Int);
-                idParameter.Direction = ParameterDirection.Output;
+                //idParameter.Direction = ParameterDirection.Output;
-                insertCommand.Parameters.Add(idParameter);
+                //insertCommand.Parameters.Add(idParameter);
                conn.Open();
-                insertCommand.ExecuteNonQuery();
-                es.EstateID = Convert.ToUInt32(idParameter.Value);
+                es.EstateID = 100;
+                if (insertCommand.ExecuteNonQuery() > 0)
+                {
+                    insertCommand.CommandText = "Select cast(lastval() as int) as ID ;";
+                    using (NpgsqlDataReader result = insertCommand.ExecuteReader())
+                    {
+                        if (result.Read())
+                        {
+                            es.EstateID = (uint)result.GetInt32(0);
+                        }
+                    }
+                }
            }
            //TODO check if this is needed??
@@ -225,20 +249,20 @@ namespace OpenSim.Data.MSSQL
            string sql = string.Format("UPDATE estate_settings SET ");
            foreach (string name in names)
            {
-                sql += name + " = @" + name + ", ";
+                sql += "\"" + name + "\" = :" + name + ", ";
            }
            sql = sql.Remove(sql.LastIndexOf(","));
-            sql += " WHERE EstateID = @EstateID";
+            sql += " WHERE \"EstateID\" = :EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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("" + name, _FieldMap[name].GetValue(es)));
                }
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", es.EstateID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
@@ -262,16 +286,16 @@ namespace OpenSim.Data.MSSQL
        {
            es.ClearBans();
-            string sql = "select bannedUUID from estateban where EstateID = @EstateID";
+            string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                SqlParameter idParameter = new SqlParameter("@EstateID", SqlDbType.Int);
+                NpgsqlParameter idParameter = new NpgsqlParameter("EstateID", DbType.Int32);
                idParameter.Value = es.EstateID;
                cmd.Parameters.Add(idParameter);
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    while (reader.Read())
                    {
@@ -290,14 +314,14 @@ namespace OpenSim.Data.MSSQL
        {
            List<UUID> uuids = new List<UUID>();
-            string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
+            string sql = string.Format("select uuid from {0} where \"EstateID\" = :EstateID", table);
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", estateID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    while (reader.Read())
                    {
@@ -312,21 +336,21 @@ namespace OpenSim.Data.MSSQL
        private void SaveBanList(EstateSettings es)
        {
            //Delete first
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
+                using (NpgsqlCommand cmd = conn.CreateCommand())
                {
-                    cmd.CommandText = "delete from estateban where EstateID = @EstateID";
+                    cmd.CommandText = "delete from estateban where \"EstateID\" = :EstateID";
-                    cmd.Parameters.AddWithValue("@EstateID", (int)es.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.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\") values ( :EstateID, :bannedUUID, '','','' )";
-                    cmd.Parameters.AddWithValue("@bannedUUID", Guid.Empty);
+                    cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty);
                    foreach (EstateBan b in es.EstateBans)
                    {
-                        cmd.Parameters["@bannedUUID"].Value = b.BannedUserID.Guid;
+                        cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
                        cmd.ExecuteNonQuery();
                    }
                }
@@ -335,20 +359,20 @@ namespace OpenSim.Data.MSSQL
        private void SaveUUIDList(uint estateID, string table, UUID[] data)
        {
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
+                using (NpgsqlCommand cmd = conn.CreateCommand())
                {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
-                    cmd.CommandText = string.Format("delete from {0} where EstateID = @EstateID", table);
+                    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.CommandText = string.Format("insert into {0} (\"EstateID\", uuid) values ( :EstateID, :uuid )", table);
-                    cmd.Parameters.AddWithValue("@uuid", Guid.Empty);
+                    cmd.Parameters.AddWithValue("uuid", Guid.Empty);
                    foreach (UUID uuid in data)
                    {
-                        cmd.Parameters["@uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
+                        cmd.Parameters["uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
                        cmd.ExecuteNonQuery();
                    }
                }
@@ -358,14 +382,14 @@ namespace OpenSim.Data.MSSQL
        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";
+            string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + "\" from estate_settings where \"EstateID\" = :EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                    {
                        if (reader.Read())
                        {
@@ -428,13 +452,13 @@ namespace OpenSim.Data.MSSQL
        public List<int> GetEstates(string search)
        {
            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateName = @EstateName";
+            string sql = "select \"EstateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.AddWithValue("@EstateName", search);
+                    cmd.Parameters.AddWithValue("EstateName", search);
                    using (IDataReader reader = cmd.ExecuteReader())
                    {
@@ -453,11 +477,11 @@ namespace OpenSim.Data.MSSQL
        public List<int> GetEstatesAll()
        {
            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings";
+            string sql = "select \"EstateID\" from estate_settings";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
                    using (IDataReader reader = cmd.ExecuteReader())
                    {
@@ -476,13 +500,13 @@ namespace OpenSim.Data.MSSQL
        public List<int> GetEstatesByOwner(UUID ownerID)
        {
            List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateOwner = @EstateOwner";
+            string sql = "select \"EstateID\" from estate_settings where \"EstateOwner\" = :EstateOwner";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.AddWithValue("@EstateOwner", ownerID);
+                    cmd.Parameters.AddWithValue("EstateOwner", ownerID);
                    using (IDataReader reader = cmd.ExecuteReader())
                    {
@@ -500,28 +524,29 @@ namespace OpenSim.Data.MSSQL
        public bool LinkRegion(UUID regionID, int estateID)
        {
-            string deleteSQL = "delete from estate_map where RegionID = @RegionID";
+            string deleteSQL = "delete from estate_map where \"RegionID\" = :RegionID";
-            string insertSQL = "insert into estate_map values (@RegionID, @EstateID)";
+            string insertSQL = "insert into estate_map values (:RegionID, :EstateID)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                SqlTransaction transaction = conn.BeginTransaction();
+                NpgsqlTransaction transaction = conn.BeginTransaction();
                try
                {
-                    using (SqlCommand cmd = new SqlCommand(deleteSQL, conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(deleteSQL, conn))
                    {
                        cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
                        cmd.ExecuteNonQuery();
                    }
-                    using (SqlCommand cmd = new SqlCommand(insertSQL, conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(insertSQL, conn))
                    {
                        cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
-                        cmd.Parameters.AddWithValue("@EstateID", estateID);
+                        cmd.Parameters.AddWithValue("EstateID", estateID);
                        int ret = cmd.ExecuteNonQuery();
@@ -545,13 +570,13 @@ namespace OpenSim.Data.MSSQL
        public List<UUID> GetRegions(int estateID)
        {
            List<UUID> result = new List<UUID>();
-            string sql = "select RegionID from estate_map where EstateID = @EstateID";
+            string sql = "select \"RegionID\" from estate_map where \"EstateID\" = :EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.AddWithValue("@EstateID", estateID);
+                    cmd.Parameters.AddWithValue("EstateID", estateID);
                    using (IDataReader reader = cmd.ExecuteReader())
                    {
diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
new file mode 100644
index 0000000..1028e4e
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -0,0 +1,111 @@
+/*
+ * 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 System.Reflection;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    /// <summary>
+    /// A database interface class to a user profile storage system
+    /// </summary>
+    public class PGSqlFramework
+    {
+        private static readonly log4net.ILog m_log =
+                log4net.LogManager.GetLogger(
+                System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        protected string m_connectionString;
+        protected object m_dbLock = new object();
+        protected PGSqlFramework(string connectionString)
+        {
+            m_connectionString = connectionString;
+            InitializeMonoSecurity();
+        }
+        public void InitializeMonoSecurity()
+        {
+            if (!Util.IsPlatformMono)
+            {
+                if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
+                {
+                    AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
+                    AppDomain currentDomain = AppDomain.CurrentDomain;
+                    currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                }
+            }
+        }
+        private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
+        {
+            Assembly MyAssembly = null;
+            if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
+            {
+                MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
+            }
+            //Return the loaded assembly.
+            return MyAssembly;
+        }
+        //////////////////////////////////////////////////////////////
+        //
+        // All non queries are funneled through one connection
+        // to increase performance a little
+        //
+        protected int ExecuteNonQuery(NpgsqlCommand cmd)
+        {
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    cmd.Connection = dbcon;
+                    try
+                    {
+                        return cmd.ExecuteNonQuery();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(e.Message, e);
+                        return 0;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
index fef6978..a841353 100644
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -31,18 +31,18 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLFriendsData : MSSQLGenericTableHandler<FriendsData>, IFriendsData
+    public class PGSQLFriendsData : PGSQLGenericTableHandler<FriendsData>, IFriendsData
    {
-        public MSSQLFriendsData(string connectionString, string realm)
+        public PGSQLFriendsData(string connectionString, string realm)
            : base(connectionString, realm, "FriendsStore")
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
                conn.Open();
                Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
@@ -50,19 +50,27 @@ namespace OpenSim.Data.MSSQL
            }
        }
-        public bool Delete(UUID principalID, string friend)
+        
+        public override bool Delete(string principalID, string friend)
        {
-            return Delete(principalID.ToString(), friend);
+            UUID princUUID = UUID.Zero;
+            bool ret = UUID.TryParse(principalID, out princUUID);
+            if (ret)
+                return Delete(princUUID, friend);
+            else
+                return false;
        }
-        public bool Delete(string principalID, string friend)
+        public bool Delete(UUID principalID, string friend)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
-                cmd.CommandText = String.Format("delete from {0} where PrincipalID = @PrincipalID and Friend = @Friend", m_Realm);
+                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("PrincipalID", principalID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@Friend", friend));
+                cmd.Parameters.Add(m_database.CreateParameter("Friend", friend));
                cmd.Connection = conn;
                conn.Open();
                cmd.ExecuteNonQuery();
@@ -71,19 +79,28 @@ namespace OpenSim.Data.MSSQL
            }
        }
-        public FriendsData[] GetFriends(UUID principalID)
+        public FriendsData[] GetFriends(string principalID)
        {
-            return GetFriends(principalID.ToString());
+            UUID princUUID = UUID.Zero;
+            bool ret = UUID.TryParse(principalID, out princUUID);
+            if (ret)
+               return GetFriends(princUUID);
+            else
+                return new FriendsData[0];
        }
-        public FriendsData[] GetFriends(string principalID)
+        public FriendsData[] GetFriends(UUID principalID)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            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.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " + 
-                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                                                " 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);
@@ -92,7 +109,7 @@ namespace OpenSim.Data.MSSQL
        public FriendsData[] GetFriends(Guid principalID)
        {
-            return GetFriends(principalID.ToString());
+            return GetFriends(principalID);
        }
 
    }
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
index 4145d95..826c6fc 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -30,30 +30,38 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using System.Data.SqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using System.Text;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLGenericTableHandler<T> where T : class, new()
+    public class PGSQLGenericTableHandler<T> : PGSqlFramework where T : class, new()
    {
-//        private static readonly ILog m_log =
+        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected string m_ConnectionString;
-        protected MSSQLManager m_database; //used for parameter type translation
+        protected PGSQLManager m_database; //used for parameter type translation
        protected Dictionary<string, FieldInfo> m_Fields =
                new Dictionary<string, FieldInfo>();
+        protected Dictionary<string, string> m_FieldTypes = new Dictionary<string, string>();
        protected List<string> m_ColumnNames = null;
        protected string m_Realm;
        protected FieldInfo m_DataField = null;
-        public MSSQLGenericTableHandler(string connectionString,
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        public PGSQLGenericTableHandler(string connectionString,
                string realm, string storeName)
+            : base(connectionString)
        {
            m_Realm = realm;
            
@@ -61,7 +69,7 @@ namespace OpenSim.Data.MSSQL
            if (storeName != String.Empty)
            {
-                using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
                {
                    conn.Open();
                    Migration m = new Migration(conn, GetType().Assembly, storeName);
@@ -69,13 +77,15 @@ namespace OpenSim.Data.MSSQL
                }
            }
-            m_database = new MSSQLManager(m_ConnectionString);
+            m_database = new PGSQLManager(m_ConnectionString);
            Type t = typeof(T);
            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
                                             BindingFlags.Instance |
                                             BindingFlags.DeclaredOnly);
+            LoadFieldTypes();
            if (fields.Length == 0)
                return;
@@ -89,7 +99,31 @@ namespace OpenSim.Data.MSSQL
        }
-        private void CheckColumnNames(SqlDataReader reader)
+        private void LoadFieldTypes()
+        {
+            m_FieldTypes = new Dictionary<string, string>();
+            string query = string.Format(@"select column_name,data_type
+                        from INFORMATION_SCHEMA.COLUMNS 
+                       where table_name = lower('{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
+                        m_FieldTypes.Add((string)rdr[0], (string)rdr[1]);
+                    }
+                }
+            }
+        }
+        private void CheckColumnNames(NpgsqlDataReader reader)
        {
            if (m_ColumnNames != null)
                return;
@@ -97,6 +131,7 @@ namespace OpenSim.Data.MSSQL
            m_ColumnNames = new List<string>();
            DataTable schemaTable = reader.GetSchemaTable();
            foreach (DataRow row in schemaTable.Rows)
            {
                if (row["ColumnName"] != null &&
@@ -106,21 +141,37 @@ namespace OpenSim.Data.MSSQL
            }
        }
+        // TODO GET CONSTRAINTS FROM POSTGRESQL
        private List<string> GetConstraints()
        {
            List<string> constraints = new List<string>();
-            string query = string.Format(@"SELECT 
+            string query = string.Format(@"SELECT kcu.column_name
-                            COL_NAME(ic.object_id,ic.column_id) AS column_name
+                        FROM information_schema.table_constraints tc
-                            FROM sys.indexes AS i
+                        LEFT JOIN information_schema.key_column_usage kcu
-                            INNER JOIN sys.index_columns AS ic 
+                        ON tc.constraint_catalog = kcu.constraint_catalog
-                              ON i.object_id = ic.object_id AND i.index_id = ic.index_id
+                        AND tc.constraint_schema = kcu.constraint_schema
-                            WHERE i.is_primary_key = 1 
+                        AND tc.constraint_name = kcu.constraint_name
-                            AND i.object_id = OBJECT_ID('{0}');", m_Realm);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+                        LEFT JOIN information_schema.referential_constraints rc
-            using (SqlCommand cmd = new SqlCommand(query, conn))
+                        ON tc.constraint_catalog = rc.constraint_catalog
+                        AND tc.constraint_schema = rc.constraint_schema
+                        AND tc.constraint_name = rc.constraint_name
+                        LEFT JOIN information_schema.constraint_column_usage ccu
+                        ON rc.unique_constraint_catalog = ccu.constraint_catalog
+                        AND rc.unique_constraint_schema = ccu.constraint_schema
+                        AND rc.unique_constraint_name = ccu.constraint_name
+                        where tc.table_name = lower('{0}') 
+                        and lower(tc.constraint_type) in ('primary key')
+                        and kcu.column_name is not null
+                        ;", m_Realm);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
            {
                conn.Open();
-                using (SqlDataReader rdr = cmd.ExecuteReader())
+                using (NpgsqlDataReader rdr = cmd.ExecuteReader())
                {
                    while (rdr.Read())
                    {
@@ -144,14 +195,18 @@ namespace OpenSim.Data.MSSQL
            List<string> terms = new List<string>();
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
                for (int i = 0; i < fields.Length; i++)
                {
-                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    if ( m_FieldTypes.ContainsKey(fields[i]) )
-                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add(" \"" + fields[i] + "\" = :" + fields[i]);
                }
                string where = String.Join(" AND ", terms.ToArray());
@@ -166,10 +221,18 @@ namespace OpenSim.Data.MSSQL
            }
        }
-        protected T[] DoQuery(SqlCommand cmd)
+        protected T[] DoQuery(NpgsqlCommand cmd)
        {
            List<T> result = new List<T>();
-            using (SqlDataReader reader = cmd.ExecuteReader())
+            if (cmd.Connection == null)
+            {
+                cmd.Connection = new NpgsqlConnection(m_connectionString);
+            }
+            if (cmd.Connection.State == ConnectionState.Closed)
+            {
+                cmd.Connection.Open();
+            }
+            using (NpgsqlDataReader reader = cmd.ExecuteReader())
            {
                if (reader == null)
                    return new T[0];
@@ -213,6 +276,7 @@ namespace OpenSim.Data.MSSQL
                        foreach (string col in m_ColumnNames)
                        {
                            data[col] = reader[col].ToString();
                            if (data[col] == null)
                                data[col] = String.Empty;
                        }
@@ -228,16 +292,34 @@ namespace OpenSim.Data.MSSQL
        public virtual T[] Get(string where)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            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);
-                //m_log.WarnFormat("[MSSQLGenericTable]: SELECT {0} WHERE {1}", m_Realm, where);
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+        public virtual T[] Get(string where, NpgsqlParameter parameter)
+        {
+            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);
+                cmd.Parameters.Add(parameter);
                conn.Open();
                return DoQuery(cmd);
@@ -249,8 +331,8 @@ namespace OpenSim.Data.MSSQL
            List<string> constraintFields = GetConstraints();
            List<KeyValuePair<string, string>> constraints = new List<KeyValuePair<string, string>>();
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
                StringBuilder query = new StringBuilder();
@@ -260,21 +342,24 @@ namespace OpenSim.Data.MSSQL
                foreach (FieldInfo fi in m_Fields.Values)
                {
                    names.Add(fi.Name);
-                    values.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(
-                                "[MSSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
+                                "[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()));
+                        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_FieldTypes.ContainsKey(fi.Name))
+                        cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row), m_FieldTypes[fi.Name]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row)));
                }
                if (m_DataField != null)
@@ -289,8 +374,12 @@ namespace OpenSim.Data.MSSQL
                            constraints.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Key));
                        }
                        names.Add(kvp.Key);
-                        values.Add("@" + kvp.Key);
+                        values.Add(":" + kvp.Key);
-                        cmd.Parameters.Add(m_database.CreateParameter("@" + kvp.Key, kvp.Value));
+                        if (m_FieldTypes.ContainsKey(kvp.Key))
+                            cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value, m_FieldTypes[kvp.Key]));
+                        else
+                            cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value));
                    }
                }
@@ -299,15 +388,15 @@ namespace OpenSim.Data.MSSQL
                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]);
                }
-                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);
+                        terms.Add(String.Format(" \"{0}\" = :{0}", constraints[j].Key));
                    }
                    string where = String.Join(" AND ", terms.ToArray());
                    query.AppendFormat(" WHERE {0} ", where);
@@ -319,7 +408,7 @@ namespace OpenSim.Data.MSSQL
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
                {
-                    //m_log.WarnFormat("[MSSQLGenericTable]: Updating {0}", m_Realm);
+                    //m_log.WarnFormat("[PGSQLGenericTable]: Updating {0}", m_Realm);
                    return true;
                }
                else
@@ -327,12 +416,14 @@ namespace OpenSim.Data.MSSQL
                    // assume record has not yet been inserted
                    query = new StringBuilder();
-                    query.AppendFormat("INSERT INTO {0} ([", m_Realm);
+                    query.AppendFormat("INSERT INTO {0} (\"", m_Realm);
-                    query.Append(String.Join("],[", names.ToArray()));
+                    query.Append(String.Join("\",\"", names.ToArray()));
-                    query.Append("]) values (" + String.Join(",", values.ToArray()) + ")");
+                    query.Append("\") values (" + String.Join(",", values.ToArray()) + ")");
                    cmd.Connection = conn;
                    cmd.CommandText = query.ToString();
-                    //m_log.WarnFormat("[MSSQLGenericTable]: Inserting into {0}", m_Realm);
+                    
+                    // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText);
                    if (conn.State != ConnectionState.Open)
                        conn.Open();
                    if (cmd.ExecuteNonQuery() > 0)
@@ -355,13 +446,17 @@ namespace OpenSim.Data.MSSQL
            List<string> terms = new List<string>();
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
                for (int i = 0; i < fields.Length; i++)
                {
-                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    if (m_FieldTypes.ContainsKey(fields[i]))
-                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add(" \"" + fields[i] + "\" = :" + fields[i]);
                }
                string where = String.Join(" AND ", terms.ToArray());
@@ -374,11 +469,69 @@ namespace OpenSim.Data.MSSQL
                if (cmd.ExecuteNonQuery() > 0)
                {
-                    //m_log.Warn("[MSSQLGenericTable]: " + deleteCommand);
+                    //m_log.Warn("[PGSQLGenericTable]: " + deleteCommand);
                    return true;
                }
                return false;
            }
        }
+        public long GetCount(string field, string key)
+        {
+            return GetCount(new string[] { field }, new string[] { key });
+        }
+        public long GetCount(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return 0;
+            List<string> terms = new List<string>();
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.AddWithValue(fields[i], keys[i]);
+                    terms.Add("\"" + fields[i] + "\" = :" + fields[i]);
+                }
+                string where = String.Join(" and ", terms.ToArray());
+                string query = String.Format("select count(*) from {0} where {1}",
+                                             m_Realm, where);
+                cmd.CommandText = query;
+                Object result = DoQueryScalar(cmd);
+                return Convert.ToInt64(result);
+            }
+        }
+        public long GetCount(string where)
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                string query = String.Format("select count(*) from {0} where {1}",
+                                             m_Realm, where);
+                cmd.CommandText = query;
+                object result = DoQueryScalar(cmd);
+                return Convert.ToInt64(result);
+            }
+        }
+        public object DoQueryScalar(NpgsqlCommand cmd)
+        {
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_ConnectionString))
+            {
+                dbcon.Open();
+                cmd.Connection = dbcon;
+                return cmd.ExecuteScalar();
+            }
+        }
    }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
index 9e215f9..89319f3 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGridUserData.cs
@@ -33,24 +33,23 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL Interface for Avatar Storage
+    /// A PGSQL Interface for Avatar Storage
    /// </summary>
-    public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>,
+    public class PGSQLGridUserData : PGSQLGenericTableHandler<GridUserData>,
            IGridUserData
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public MSSQLGridUserData(string connectionString, string realm) :
+        public PGSQLGridUserData(string connectionString, string realm) :
            base(connectionString, realm, "GridUserStore")
        {
        }
-        public GridUserData Get(string userID)
+        public new GridUserData Get(string userID)
        {
            GridUserData[] ret = Get("UserID", userID);
@@ -60,5 +59,10 @@ namespace OpenSim.Data.MSSQL
            return ret[0];
        }
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("\"UserID\" LIKE '{0}%'", userID));
+        }
    }
 }
diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
new file mode 100755
index 0000000..e257e7c
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
@@ -0,0 +1,485 @@
+/*
+ * 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.Reflection;
+using OpenSim.Framework;
+using OpenMetaverse;
+using log4net;
+using Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLGroupsData : IGroupsData
+    {        
+        private PGSqlGroupsGroupsHandler m_Groups;
+        private PGSqlGroupsMembershipHandler m_Membership;
+        private PGSqlGroupsRolesHandler m_Roles;
+        private PGSqlGroupsRoleMembershipHandler m_RoleMembership;
+        private PGSqlGroupsInvitesHandler m_Invites;
+        private PGSqlGroupsNoticesHandler m_Notices;
+        private PGSqlGroupsPrincipalsHandler m_Principals;
+        public PGSQLGroupsData(string connectionString, string realm)
+        {
+            m_Groups = new PGSqlGroupsGroupsHandler(connectionString, realm + "_groups", realm + "_Store");
+            m_Membership = new PGSqlGroupsMembershipHandler(connectionString, realm + "_membership");
+            m_Roles = new PGSqlGroupsRolesHandler(connectionString, realm + "_roles");
+            m_RoleMembership = new PGSqlGroupsRoleMembershipHandler(connectionString, realm + "_rolemembership");
+            m_Invites = new PGSqlGroupsInvitesHandler(connectionString, realm + "_invites");
+            m_Notices = new PGSqlGroupsNoticesHandler(connectionString, realm + "_notices");
+            m_Principals = new PGSqlGroupsPrincipalsHandler(connectionString, realm + "_principals");
+        }
+        #region groups table
+        public bool StoreGroup(GroupData data)
+        {
+            return m_Groups.Store(data);
+        }
+        public GroupData RetrieveGroup(UUID groupID)
+        {
+            GroupData[] groups = m_Groups.Get("GroupID", groupID.ToString());
+            if (groups.Length > 0)
+                return groups[0];
+            return null;
+        }
+        public GroupData RetrieveGroup(string name)
+        {
+            GroupData[] groups = m_Groups.Get("Name", name);
+            if (groups.Length > 0)
+                return groups[0];
+            return null;
+        }
+        public GroupData[] RetrieveGroups(string pattern)
+        {
+                       
+            if (string.IsNullOrEmpty(pattern)) // True for where clause
+            {
+                pattern = " 1 ORDER BY lower(\"Name\") LIMIT 100";
+                
+                return m_Groups.Get(pattern);
+            }
+            else   
+            {             
+                pattern = " \"ShowInList\" = 1 AND lower(\"Name\") LIKE lower('%" + pattern + "%') ORDER BY lower(\"Name\") LIMIT 100";
+        
+                return m_Groups.Get(pattern, new NpgsqlParameter("pattern", pattern));
+            }
+        }
+        public bool DeleteGroup(UUID groupID)
+        {
+            return m_Groups.Delete("GroupID", groupID.ToString());
+        }
+        public int GroupsCount()
+        {
+            return (int)m_Groups.GetCount(" \"Location\" = \"\"");
+        }
+        #endregion
+        #region membership table
+        public MembershipData[] RetrieveMembers(UUID groupID)
+        {
+            return m_Membership.Get("GroupID", groupID.ToString());
+        }
+        public MembershipData RetrieveMember(UUID groupID, string pricipalID)
+        {
+            MembershipData[] m = m_Membership.Get(new string[] { "GroupID", "PrincipalID" },
+                                                  new string[] { groupID.ToString(), pricipalID });
+            if (m != null && m.Length > 0)
+                return m[0];
+            return null;
+        }
+        public MembershipData[] RetrieveMemberships(string pricipalID)
+        {
+            return m_Membership.Get("PrincipalID", pricipalID.ToString());
+        }
+        public bool StoreMember(MembershipData data)
+        {
+            return m_Membership.Store(data);
+        }
+        public bool DeleteMember(UUID groupID, string pricipalID)
+        {
+            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+                                       new string[] { groupID.ToString(), pricipalID });
+        }
+        
+        public int MemberCount(UUID groupID)
+        {
+            return (int)m_Membership.GetCount("GroupID", groupID.ToString());
+        }
+        #endregion
+        #region roles table
+        public bool StoreRole(RoleData data)
+        {
+            return m_Roles.Store(data);
+        }
+        public RoleData RetrieveRole(UUID groupID, UUID roleID)
+        {
+            RoleData[] data = m_Roles.Get(new string[] { "GroupID", "RoleID" },
+                                          new string[] { groupID.ToString(), roleID.ToString() });
+            if (data != null && data.Length > 0)
+                return data[0];
+            return null;
+        }
+        public RoleData[] RetrieveRoles(UUID groupID)
+        {
+            //return m_Roles.RetrieveRoles(groupID);
+            return m_Roles.Get("GroupID", groupID.ToString());
+        }
+        public bool DeleteRole(UUID groupID, UUID roleID)
+        {
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+                                  new string[] { groupID.ToString(), roleID.ToString() });
+        }
+        public int RoleCount(UUID groupID)
+        {
+            return (int)m_Roles.GetCount("GroupID", groupID.ToString());
+        }
+        #endregion
+        #region rolememberhip table
+        public RoleMembershipData[] RetrieveRolesMembers(UUID groupID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get("GroupID", groupID.ToString());
+            return data;
+        }
+        public RoleMembershipData[] RetrieveRoleMembers(UUID groupID, UUID roleID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "RoleID" },
+                                                             new string[] { groupID.ToString(), roleID.ToString() });
+            return data;
+        }
+        public RoleMembershipData[] RetrieveMemberRoles(UUID groupID, string principalID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "PrincipalID" },
+                                                             new string[] { groupID.ToString(), principalID.ToString() });
+            return data;
+        }
+        public RoleMembershipData RetrieveRoleMember(UUID groupID, UUID roleID, string principalID)
+        {
+            RoleMembershipData[] data = m_RoleMembership.Get(new string[] { "GroupID", "RoleID", "PrincipalID" },
+                                                             new string[] { groupID.ToString(), roleID.ToString(), principalID.ToString() });
+            if (data != null && data.Length > 0)
+                return data[0];
+            return null;
+        }
+        public int RoleMemberCount(UUID groupID, UUID roleID)
+        {
+            return (int)m_RoleMembership.GetCount(new string[] { "GroupID", "RoleID" },
+                                                  new string[] { groupID.ToString(), roleID.ToString() });
+        }
+        public bool StoreRoleMember(RoleMembershipData data)
+        {
+            return m_RoleMembership.Store(data);
+        }
+        public bool DeleteRoleMember(RoleMembershipData data)
+        {
+            return m_RoleMembership.Delete(new string[] { "GroupID", "RoleID", "PrincipalID"},
+                                           new string[] { data.GroupID.ToString(), data.RoleID.ToString(), data.PrincipalID });
+        }
+        public bool DeleteMemberAllRoles(UUID groupID, string principalID)
+        {
+            return m_RoleMembership.Delete(new string[] { "GroupID", "PrincipalID" },
+                                           new string[] { groupID.ToString(), principalID });
+        }
+        #endregion
+        #region principals table
+        public bool StorePrincipal(PrincipalData data)
+        {
+            return m_Principals.Store(data);
+        }
+        public PrincipalData RetrievePrincipal(string principalID)
+        {
+            PrincipalData[] p = m_Principals.Get("PrincipalID", principalID);
+            if (p != null && p.Length > 0)
+                return p[0];
+            return null;
+        }
+        public bool DeletePrincipal(string principalID)
+        {
+            return m_Principals.Delete("PrincipalID", principalID);
+        }
+        #endregion
+        #region invites table
+        public bool StoreInvitation(InvitationData data)
+        {
+            return m_Invites.Store(data);
+        }
+        public InvitationData RetrieveInvitation(UUID inviteID)
+        {
+            InvitationData[] invites = m_Invites.Get("InviteID", inviteID.ToString());
+            if (invites != null && invites.Length > 0)
+                return invites[0];
+            return null;
+        }
+        public InvitationData RetrieveInvitation(UUID groupID, string principalID)
+        {
+            InvitationData[] invites = m_Invites.Get(new string[] { "GroupID", "PrincipalID" },
+                                                     new string[] { groupID.ToString(), principalID });
+            if (invites != null && invites.Length > 0)
+                return invites[0];
+            return null;
+        }
+        public bool DeleteInvite(UUID inviteID)
+        {
+            return m_Invites.Delete("InviteID", inviteID.ToString());
+        }
+        public void DeleteOldInvites()
+        {
+            m_Invites.DeleteOld();
+        }
+        #endregion
+        #region notices table
+        public bool StoreNotice(NoticeData data)
+        {
+            return m_Notices.Store(data);
+        }
+        public NoticeData RetrieveNotice(UUID noticeID)
+        {
+            NoticeData[] notices = m_Notices.Get("NoticeID", noticeID.ToString());
+            if (notices != null && notices.Length > 0)
+                return notices[0];
+            return null;
+        }
+        public NoticeData[] RetrieveNotices(UUID groupID)
+        {
+            NoticeData[] notices = m_Notices.Get("GroupID", groupID.ToString());
+            return notices;
+        }
+        public bool DeleteNotice(UUID noticeID)
+        {
+            return m_Notices.Delete("NoticeID", noticeID.ToString());
+        }
+        public void DeleteOldNotices()
+        {
+            m_Notices.DeleteOld();
+        }
+        #endregion
+        #region combinations
+        public MembershipData RetrievePrincipalGroupMembership(string principalID, UUID groupID)
+        {
+            // TODO
+            return null;
+        }
+        public MembershipData[] RetrievePrincipalGroupMemberships(string principalID)
+        {
+            // TODO
+            return null;
+        }
+        #endregion
+    }
+    public class PGSqlGroupsGroupsHandler : PGSQLGenericTableHandler<GroupData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+            : base(connectionString, realm, store)
+        {
+        }
+    }
+    public class PGSqlGroupsMembershipHandler : PGSQLGenericTableHandler<MembershipData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsMembershipHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+    }
+    public class PGSqlGroupsRolesHandler : PGSQLGenericTableHandler<RoleData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsRolesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+    }
+    public class PGSqlGroupsRoleMembershipHandler : PGSQLGenericTableHandler<RoleMembershipData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+    }
+    public class PGSqlGroupsInvitesHandler : PGSQLGenericTableHandler<InvitationData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsInvitesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+        public void DeleteOld()
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
+                
+                ExecuteNonQuery(cmd);
+            }
+        }
+    }
+    public class PGSqlGroupsNoticesHandler : PGSQLGenericTableHandler<NoticeData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsNoticesHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+        public void DeleteOld()
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
+                
+                ExecuteNonQuery(cmd);
+            }
+        }
+    }
+    public class PGSqlGroupsPrincipalsHandler : PGSQLGenericTableHandler<PrincipalData>
+    {
+        protected override Assembly Assembly
+        {
+            // WARNING! Moving migrations to this assembly!!!
+            get { return GetType().Assembly; }
+        }
+        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm) 
+            : base(connectionString, realm, string.Empty)
+        {
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLHGTravelData.cs b/OpenSim/Data/PGSQL/PGSQLHGTravelData.cs
new file mode 100644
index 0000000..c71b15f
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLHGTravelData.cs
@@ -0,0 +1,80 @@
+/*
+ * 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 PGSQL Interface for user grid data
+    /// </summary>
+    public class PGSQLHGTravelData : PGSQLGenericTableHandler<HGTravelingData>, IHGTravelingData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public PGSQLHGTravelData(string connectionString, string realm) : base(connectionString, realm, "HGTravelStore") { }
+        public HGTravelingData Get(UUID sessionID)
+        {
+            HGTravelingData[] ret = Get("SessionID", sessionID.ToString());
+            if (ret.Length == 0)
+                return null;
+            return ret[0];
+        }
+        public HGTravelingData[] GetSessions(UUID userID)
+        {
+            return base.Get("UserID", userID.ToString());
+        }
+        public bool Delete(UUID sessionID)
+        {
+            return Delete("SessionID", sessionID.ToString());
+        }
+        public void DeleteOld()
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format(@"delete from {0} where ""TMStamp"" < CURRENT_DATE - INTERVAL '2 day'", m_Realm);
+                ExecuteNonQuery(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
index 961593f..c999433 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -28,18 +28,18 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL interface for the inventory server
+    /// A PGSQL interface for the inventory server
    /// </summary>
-    public class MSSQLInventoryData : IInventoryDataPlugin
+    public class PGSQLInventoryData : IInventoryDataPlugin
    {
        private const string _migrationStore = "InventoryStore";
@@ -48,7 +48,7 @@ namespace OpenSim.Data.MSSQL
        /// <summary>
        /// The database manager
        /// </summary>
-        private MSSQLManager database;
+        private PGSQLManager database;
        private string m_connectionString;
        #region IPlugin members
@@ -56,19 +56,19 @@ namespace OpenSim.Data.MSSQL
        [Obsolete("Cannot be default-initialized!")]
        public void Initialise()
        {
-            m_log.Info("[MSSQLInventoryData]: " + Name + " cannot be default-initialized!");
+            m_log.Info("[PGSQLInventoryData]: " + Name + " cannot be default-initialized!");
            throw new PluginNotInitialisedException(Name);
        }
        /// <summary>
-        /// Loads and initialises the MSSQL inventory storage interface
+        /// Loads and initialises the PGSQL inventory storage interface
        /// </summary>
        /// <param name="connectionString">connect string</param>
-        /// <remarks>use mssql_connection.ini</remarks>
+        /// <remarks>use PGSQL_connection.ini</remarks>
        public void Initialise(string connectionString)
        {
            m_connectionString = connectionString;
-            database = new MSSQLManager(connectionString);
+            database = new PGSQLManager(connectionString);
          
            //New migrations check of store
            database.CheckMigration(_migrationStore);
@@ -80,7 +80,7 @@ namespace OpenSim.Data.MSSQL
        /// <returns>A string containing the name of the DB provider</returns>
        public string Name
        {
-            get { return "MSSQL Inventory Data Interface"; }
+            get { return "PGSQL Inventory Data Interface"; }
        }
        /// <summary>
@@ -158,13 +158,13 @@ namespace OpenSim.Data.MSSQL
        /// <returns>A folder class</returns>
        public InventoryFolderBase getInventoryFolder(UUID folderID)
        {
-            string sql = "SELECT * FROM inventoryfolders WHERE folderID = @folderID";
+            string sql = "SELECT * FROM inventoryfolders WHERE \"folderID\" = :folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -200,11 +200,11 @@ namespace OpenSim.Data.MSSQL
            if (parentID == UUID.Zero)
                return folders;
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
+            string sql = "SELECT * FROM inventoryfolders WHERE \"parentFolderID\" = :parentID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(database.CreateParameter("@parentID", parentID));
+                cmd.Parameters.Add(database.CreateParameter("parentID", parentID));
                conn.Open();
                folders.AddRange(getInventoryFolders(cmd));
@@ -228,8 +228,8 @@ namespace OpenSim.Data.MSSQL
        /// <param name="folder">Folder to create</param>
        public void addInventoryFolder(InventoryFolderBase folder)
        {
-            string sql = @"INSERT INTO inventoryfolders ([folderID], [agentID], [parentFolderID], [folderName], [type], [version]) 
+            string sql = "INSERT INTO inventoryfolders (\"folderID\", \"agentID\", \"parentFolderID\", \"folderName\", type, version) " +
-                            VALUES (@folderID, @agentID, @parentFolderID, @folderName, @type, @version);";
+                         "   VALUES (:folderID, :agentID, :parentFolderID, :folderName, :type, :version);";
            string folderName = folder.Name;
            if (folderName.Length > 64)
@@ -237,8 +237,8 @@ namespace OpenSim.Data.MSSQL
                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 (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
@@ -264,12 +264,12 @@ namespace OpenSim.Data.MSSQL
        /// <param name="folder">Folder to update</param>
        public void updateInventoryFolder(InventoryFolderBase folder)
        {
-            string sql = @"UPDATE inventoryfolders SET agentID = @agentID, 
+            string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID, 
-                                                       parentFolderID = @parentFolderID,
+                                                       ""parentFolderID"" = :parentFolderID,
-                                                       folderName = @folderName,
+                                                       ""folderName"" = :folderName,
-                                                       type = @type,
+                                                       type = :type,
-                                                       version = @version 
+                                                       version = :version 
-                           WHERE folderID = @folderID";
+                           WHERE folderID = :folderID";
            string folderName = folder.Name;
            if (folderName.Length > 64)
@@ -277,8 +277,8 @@ namespace OpenSim.Data.MSSQL
                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 (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
@@ -304,9 +304,9 @@ namespace OpenSim.Data.MSSQL
        /// <param name="folder">Folder to update</param>
        public void moveInventoryFolder(InventoryFolderBase folder)
        {
-            string sql = @"UPDATE inventoryfolders SET parentFolderID = @parentFolderID WHERE folderID = @folderID";
+            string sql = @"UPDATE inventoryfolders SET ""parentFolderID"" = :parentFolderID WHERE ""folderID"" = :folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
@@ -328,13 +328,13 @@ namespace OpenSim.Data.MSSQL
        /// <param name="folderID">Id of folder to delete</param>
        public void deleteInventoryFolder(UUID folderID)
        {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                List<InventoryFolderBase> subFolders;
-                cmd.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero));
+                cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
                conn.Open();
                subFolders = getFolderHierarchy(folderID, cmd);
                
@@ -363,15 +363,15 @@ namespace OpenSim.Data.MSSQL
        /// <returns>A list containing inventory items</returns>
        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
        {
-            string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID";
+            string sql = @"SELECT * FROM inventoryitems WHERE ""parentFolderID"" = :parentFolderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
                conn.Open();
                List<InventoryItemBase> items = new List<InventoryItemBase>();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    while (reader.Read())
                    {
@@ -389,13 +389,13 @@ namespace OpenSim.Data.MSSQL
        /// <returns>An inventory item</returns>
        public InventoryItemBase getInventoryItem(UUID itemID)
        {
-            string sql = "SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID";
+            string sql = @"SELECT * FROM inventoryitems WHERE ""inventoryID"" = :inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -421,15 +421,15 @@ namespace OpenSim.Data.MSSQL
            }
            string sql = @"INSERT INTO inventoryitems 
-                            ([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName], 
+                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", 
-                             [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions],
+                             ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"",
-                             [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions], [inventoryGroupPermissions],
+                             ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"",
-                             [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) 
+                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) 
                        VALUES
-                            (@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription,
+                            (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
-                             @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID,
+                             :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
-                             @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType,
+                             :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType,
-                             @creationDate, @groupID, @groupOwned, @flags)";
+                             :creationDate, :groupID, :groupOwned, :flags)";
            
            string itemName = item.Name;
            if (item.Name.Length > 64)
@@ -445,8 +445,8 @@ namespace OpenSim.Data.MSSQL
                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
            }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -462,8 +462,8 @@ namespace OpenSim.Data.MSSQL
                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("SalePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                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));
@@ -479,9 +479,9 @@ namespace OpenSim.Data.MSSQL
                }
            }
-            sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID";
+            sql = @"UPDATE inventoryfolders SET version = version + 1 WHERE ""folderID"" = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
                command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
                conn.Open();
@@ -502,26 +502,26 @@ namespace OpenSim.Data.MSSQL
        /// <param name="item">Inventory item to update</param>
        public void updateInventoryItem(InventoryItemBase item)
        {
-            string sql = @"UPDATE inventoryitems SET assetID = @assetID, 
+            string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID, 
-                                                assetType = @assetType,
+                                                ""assetType"" = :assetType,
-                                                parentFolderID = @parentFolderID,
+                                                ""parentFolderID"" = :parentFolderID,
-                                                avatarID = @avatarID,
+                                                ""avatarID"" = :avatarID,
-                                                inventoryName = @inventoryName, 
+                                                ""inventoryName"" = :inventoryName, 
-                                                inventoryDescription = @inventoryDescription, 
+                                                ""inventoryDescription"" = :inventoryDescription, 
-                                                inventoryNextPermissions = @inventoryNextPermissions, 
+                                                ""inventoryNextPermissions"" = :inventoryNextPermissions, 
-                                                inventoryCurrentPermissions = @inventoryCurrentPermissions, 
+                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, 
-                                                invType = @invType, 
+                                                ""invType"" = :invType, 
-                                                creatorID = @creatorID, 
+                                                ""creatorID"" = :creatorID, 
-                                                inventoryBasePermissions = @inventoryBasePermissions, 
+                                                ""inventoryBasePermissions"" = :inventoryBasePermissions, 
-                                                inventoryEveryOnePermissions = @inventoryEveryOnePermissions, 
+                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, 
-                                                inventoryGroupPermissions = @inventoryGroupPermissions, 
+                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions, 
-                                                salePrice = @salePrice, 
+                                                ""salePrice"" = :SalePrice, 
-                                                saleType = @saleType, 
+                                                ""saleType"" = :SaleType, 
-                                                creationDate = @creationDate, 
+                                                ""creationDate"" = :creationDate, 
-                                                groupID = @groupID, 
+                                                ""groupID"" = :groupID, 
-                                                groupOwned = @groupOwned, 
+                                                ""groupOwned"" = :groupOwned, 
-                                                flags = @flags 
+                                                flags = :flags 
-                                        WHERE inventoryID = @inventoryID";
+                                        WHERE ""inventoryID"" = :inventoryID";
            string itemName = item.Name;
            if (item.Name.Length > 64)
@@ -537,8 +537,8 @@ namespace OpenSim.Data.MSSQL
                m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
            }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
                command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -554,8 +554,8 @@ namespace OpenSim.Data.MSSQL
                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("SalePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                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));
@@ -580,9 +580,9 @@ namespace OpenSim.Data.MSSQL
        /// <param name="itemID">the item UUID</param>
        public void deleteInventoryItem(UUID itemID)
        {
-            string sql = "DELETE FROM inventoryitems WHERE inventoryID=@inventoryID";
+            string sql = @"DELETE FROM inventoryitems WHERE ""inventoryID""=:inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
                try
@@ -616,14 +616,14 @@ namespace OpenSim.Data.MSSQL
        /// </returns>
        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
        {
-            string sql = "SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1";
+            string sql = @"SELECT * FROM inventoryitems WHERE ""avatarID"" = :uuid AND ""assetType"" = :assetType and flags = 1";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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 (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
                    while (reader.Read())
@@ -644,9 +644,9 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        /// <param name="folderID">the item ID</param>
        /// <param name="connection">connection to the database</param>
-        private void DeleteItemsInFolder(UUID folderID, SqlConnection connection)
+        private void DeleteItemsInFolder(UUID folderID, NpgsqlConnection connection)
        {
-            using (SqlCommand command = new SqlCommand("DELETE FROM inventoryitems WHERE folderID=@folderID", connection))
+            using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryitems WHERE ""folderID""=:folderID", connection))
            {
                command.Parameters.Add(database.CreateParameter("folderID", folderID));
@@ -667,9 +667,9 @@ namespace OpenSim.Data.MSSQL
        /// <param name="parentID">parent ID.</param>
        /// <param name="command">SQL command/connection to database</param>
        /// <returns></returns>
-        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, SqlCommand command)
+        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, NpgsqlCommand command)
        {
-            command.Parameters["@parentID"].Value = parentID.Guid; //.ToString();
+            command.Parameters["parentID"].Value = parentID.Guid; //.ToString();
            List<InventoryFolderBase> folders = getInventoryFolders(command);
@@ -698,9 +698,9 @@ namespace OpenSim.Data.MSSQL
        /// <returns></returns>
        private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
        {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid";
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID AND ""agentID"" = :uuid";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
                if (user == UUID.Zero)
                {
@@ -721,9 +721,9 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        /// <param name="command">SQLcommand.</param>
        /// <returns></returns>
-        private static List<InventoryFolderBase> getInventoryFolders(SqlCommand command)
+        private static List<InventoryFolderBase> getInventoryFolders(NpgsqlCommand command)
        {
-            using (SqlDataReader reader = command.ExecuteReader())
+            using (NpgsqlDataReader reader = command.ExecuteReader())
            {
                List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -738,9 +738,9 @@ namespace OpenSim.Data.MSSQL
        /// <summary>
        /// Reads a list of inventory folders returned by a query.
        /// </summary>
-        /// <param name="reader">A MSSQL Data Reader</param>
+        /// <param name="reader">A PGSQL Data Reader</param>
        /// <returns>A List containing inventory folders</returns>
-        protected static InventoryFolderBase readInventoryFolder(SqlDataReader reader)
+        protected static InventoryFolderBase readInventoryFolder(NpgsqlDataReader reader)
        {
            try
            {
@@ -796,7 +796,7 @@ namespace OpenSim.Data.MSSQL
                return item;
            }
-            catch (SqlException e)
+            catch (NpgsqlException e)
            {
                m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message);
            }
@@ -809,18 +809,18 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        /// <param name="folderID">the folder UUID</param>
        /// <param name="connection">connection to database</param>
-        private void DeleteOneFolder(UUID folderID, SqlConnection connection)
+        private void DeleteOneFolder(UUID folderID, NpgsqlConnection connection)
        {
            try
            {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
+                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 (SqlException e)
+            catch (NpgsqlException e)
            {
                m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message);
            }
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 9a0015c..46f835a 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -28,18 +28,20 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Reflection;
+using OpenSim.Framework;
 using log4net;
 using OpenMetaverse;
+using Npgsql;
+using NpgsqlTypes;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
    /// A management class for the MS SQL Storage Engine
    /// </summary>
-    public class MSSQLManager
+    public class PGSQLManager
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -52,9 +54,37 @@ namespace OpenSim.Data.MSSQL
        /// Initialize the manager and set the connectionstring
        /// </summary>
        /// <param name="connection"></param>
-        public MSSQLManager(string connection)
+        public PGSQLManager(string connection)
        {
            connectionString = connection;
+            InitializeMonoSecurity();
+        }
+        public void InitializeMonoSecurity()
+        {
+            if (!Util.IsPlatformMono)
+            {
+                if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
+                {
+                    AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
+                    AppDomain currentDomain = AppDomain.CurrentDomain;
+                    currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                }
+            }
+        }
+        private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
+        {
+            Assembly MyAssembly = null;
+            if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
+            {
+                MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
+            }
+            //Return the loaded assembly.
+            return MyAssembly;
        }
        /// <summary>
@@ -62,54 +92,97 @@ namespace OpenSim.Data.MSSQL
        /// </summary>
        /// <param name="type"></param>
        /// <returns></returns>
-        internal SqlDbType DbtypeFromType(Type type)
+        internal NpgsqlDbType DbtypeFromType(Type type)
        {
            if (type == typeof(string))
            {
-                return SqlDbType.VarChar;
+                return NpgsqlDbType.Varchar;
            }
            if (type == typeof(double))
            {
-                return SqlDbType.Float;
+                return NpgsqlDbType.Double;
            }
            if (type == typeof(Single))
            {
-                return SqlDbType.Float;
+                return NpgsqlDbType.Double;
            }
            if (type == typeof(int))
            {
-                return SqlDbType.Int;
+                return NpgsqlDbType.Integer;
            }
            if (type == typeof(bool))
            {
-                return SqlDbType.Bit;
+                return NpgsqlDbType.Boolean;
            }
            if (type == typeof(UUID))
            {
-                return SqlDbType.UniqueIdentifier;
+                return NpgsqlDbType.Uuid;
+            }
+            if (type == typeof(byte))
+            {
+                return NpgsqlDbType.Smallint;
            }
            if (type == typeof(sbyte))
            {
-                return SqlDbType.Int;
+                return NpgsqlDbType.Integer;
            }
            if (type == typeof(Byte[]))
            {
-                return SqlDbType.Image;
+                return NpgsqlDbType.Bytea;
            }
            if (type == typeof(uint) || type == typeof(ushort))
            {
-                return SqlDbType.Int;
+                return NpgsqlDbType.Integer;
            }
            if (type == typeof(ulong))
            {
-                return SqlDbType.BigInt;
+                return NpgsqlDbType.Bigint;
            }
            if (type == typeof(DateTime))
            {
-                return SqlDbType.DateTime;
+                return NpgsqlDbType.Timestamp;
            }
-            return SqlDbType.VarChar;
+            return NpgsqlDbType.Varchar;
+        }
+        internal NpgsqlDbType DbtypeFromString(Type type, string PGFieldType)
+        {
+            if (PGFieldType == "")
+            {
+                return DbtypeFromType(type);
+            }
+            if (PGFieldType == "character varying")
+            {
+                return NpgsqlDbType.Varchar;
+            }
+            if (PGFieldType == "double precision")
+            {
+                return NpgsqlDbType.Double;
+            }
+            if (PGFieldType == "integer")
+            {
+                return NpgsqlDbType.Integer;
+            }
+            if (PGFieldType == "smallint")
+            {
+                return NpgsqlDbType.Smallint;
+            }
+            if (PGFieldType == "boolean")
+            {
+                return NpgsqlDbType.Boolean;
+            }
+            if (PGFieldType == "uuid")
+            {
+                return NpgsqlDbType.Uuid;
+            }
+            if (PGFieldType == "bytea")
+            {
+                return NpgsqlDbType.Bytea;
+            }
+            return DbtypeFromType(type);
        }
        /// <summary>
@@ -131,7 +204,7 @@ namespace OpenSim.Data.MSSQL
            }
            if (valueType == typeof(bool))
            {
-                return (bool)value ? 1 : 0;
+                return (bool)value;
            }
            if (valueType == typeof(Byte[]))
            {
@@ -145,12 +218,51 @@ namespace OpenSim.Data.MSSQL
        }
        /// <summary>
+        ///  Create value for parameter based on PGSQL Schema
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="PGFieldType"></param>
+        /// <returns></returns>
+        internal static object CreateParameterValue(object value, string PGFieldType)
+        {
+            if (PGFieldType == "uuid")
+            {
+                UUID uidout;
+                UUID.TryParse(value.ToString(), out uidout);
+                return uidout;
+            }
+            if (PGFieldType == "integer")
+            {
+                int intout;
+                int.TryParse(value.ToString(), out intout);
+                return intout;
+            }
+            if (PGFieldType == "boolean")
+            {
+                return (value.ToString() == "true");
+            }
+            if (PGFieldType == "timestamp with time zone")
+            {
+                return (DateTime)value;
+            }
+            if (PGFieldType == "timestamp without time zone")
+            {
+                return (DateTime)value;
+            }
+            if (PGFieldType == "double precision")
+            {
+                return (Double)value;
+            }
+            return CreateParameterValue(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 SqlParameter CreateParameter(string parameterName, object parameterObject)
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject)
        {
            return CreateParameter(parameterName, parameterObject, false);
        }
@@ -162,15 +274,15 @@ namespace OpenSim.Data.MSSQL
        /// <param name="parameterObject">parameter object.</param>
        /// <param name="parameterOut">if set to <c>true</c> parameter is a output parameter</param>
        /// <returns></returns>
-        internal SqlParameter CreateParameter(string parameterName, object parameterObject, bool parameterOut)
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, bool parameterOut)
        {
-            //Tweak so we dont always have to add @ sign
+            //Tweak so we dont always have to add : sign
-            if (!parameterName.StartsWith("@")) parameterName = "@" + parameterName;
+            if (parameterName.StartsWith(":")) parameterName = parameterName.Replace(":","");
            //HACK if object is null, it is turned into a string, there are no nullable type till now
            if (parameterObject == null) parameterObject = "";
-            SqlParameter parameter = new SqlParameter(parameterName, DbtypeFromType(parameterObject.GetType()));
+            NpgsqlParameter parameter = new NpgsqlParameter(parameterName, DbtypeFromType(parameterObject.GetType()));
            if (parameterOut)
            {
@@ -186,16 +298,39 @@ namespace OpenSim.Data.MSSQL
        }
        /// <summary>
+        /// Create a parameter with PGSQL schema type
+        /// </summary>
+        /// <param name="parameterName"></param>
+        /// <param name="parameterObject"></param>
+        /// <param name="PGFieldType"></param>
+        /// <returns></returns>
+        internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, string PGFieldType)
+        {
+            //Tweak so we dont always have to add : sign
+            if (parameterName.StartsWith(":")) parameterName = parameterName.Replace(":", "");
+            //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, DbtypeFromString(parameterObject.GetType(), PGFieldType));
+            parameter.Direction = ParameterDirection.Input;
+            parameter.Value = CreateParameterValue(parameterObject, PGFieldType);
+            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 (SqlConnection connection = new SqlConnection(connectionString)) 
+            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) 
            {
                connection.Open();
                Assembly assem = GetType().Assembly;
-                MSSQLMigration migration = new MSSQLMigration(connection, assem, migrationStore);
+                PGSQLMigration migration = new PGSQLMigration(connection, assem, migrationStore);
                migration.Update();
            }
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs
index c2fecef..709fde0 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -25,22 +25,22 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using Npgsql;
 using System;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
-using System.Data.SqlClient;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLMigration : Migration
+    public class PGSQLMigration : Migration
    {
-        public MSSQLMigration(DbConnection conn, Assembly assem, string type)
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string type)
            : base(conn, assem, type)
        {
        }
-        public MSSQLMigration(DbConnection conn, Assembly assem, string subtype, string type)
+        public PGSQLMigration(NpgsqlConnection conn, Assembly assem, string subtype, string type)
            : base(conn, assem, subtype, type)
        {
        }
@@ -48,12 +48,15 @@ namespace OpenSim.Data.MSSQL
        protected override int FindVersion(DbConnection conn, string type)
        {
            int version = 0;
-            using (DbCommand cmd = conn.CreateCommand())
+            NpgsqlConnection lcConn = (NpgsqlConnection)conn;
+            using (NpgsqlCommand cmd = lcConn.CreateCommand())
            {
                try
                {
-                    cmd.CommandText = "select top 1 version from migrations where name = '" + type + "' order by version desc"; //Must be 
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
-                    using (IDataReader reader = cmd.ExecuteReader())
+                                      " order by version desc limit 1"; //Must be 
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                    {
                        if (reader.Read())
                        {
@@ -73,7 +76,7 @@ namespace OpenSim.Data.MSSQL
        protected override void ExecuteScript(DbConnection conn, string[] script)
        {
-            if (!(conn is SqlConnection))
+            if (!(conn is NpgsqlConnection))
            {
                base.ExecuteScript(conn, script);
                return;
@@ -83,7 +86,7 @@ namespace OpenSim.Data.MSSQL
            {
                try
                {
-                    using (SqlCommand cmd = new SqlCommand(sql, (SqlConnection)conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(sql, (NpgsqlConnection)conn))
                    {
                        cmd.ExecuteNonQuery();
                    }
diff --git a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
new file mode 100644
index 0000000..82e5ed8
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
@@ -0,0 +1,56 @@
+/*
+ * 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.Reflection;
+using OpenSim.Framework;
+using OpenMetaverse;
+using Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLOfflineIMData : PGSQLGenericTableHandler<OfflineIMData>, IOfflineIMData
+    {
+        public PGSQLOfflineIMData(string connectionString, string realm)
+            : base(connectionString, realm, "IM_Store")
+        {
+        }
+        public void DeleteOld()
+        {
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
+         
+                ExecuteNonQuery(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
index 0c71e79..0376585 100644..100755
--- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -33,27 +33,26 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MySQL Interface for the Presence Server
+    /// A PGSQL Interface for the Presence Server
    /// </summary>
-    public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
+    public class PGSQLPresenceData : PGSQLGenericTableHandler<PresenceData>,
            IPresenceData
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public MSSQLPresenceData(string connectionString, string realm) :
+        public PGSQLPresenceData(string connectionString, string realm) :
                base(connectionString, realm, "Presence")
        {
        }
        public PresenceData Get(UUID sessionID)
        {
-            PresenceData[] ret = Get("SessionID",
+            PresenceData[] ret = Get("SessionID", sessionID.ToString());
-                    sessionID.ToString());
            if (ret.Length == 0)
                return null;
@@ -63,13 +62,13 @@ namespace OpenSim.Data.MSSQL
        public void LogoutRegionAgents(UUID regionID)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
-                cmd.CommandText = String.Format("DELETE FROM {0} WHERE [RegionID]=@RegionID", m_Realm);
+                cmd.CommandText = String.Format("DELETE FROM {0} WHERE \"RegionID\" = :regionID", m_Realm);
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
                cmd.Connection = conn;
                conn.Open();
                cmd.ExecuteNonQuery();
@@ -81,17 +80,18 @@ namespace OpenSim.Data.MSSQL
            PresenceData[] pd = Get("SessionID", sessionID.ToString());
            if (pd.Length == 0)
                return false;
+                
+            if (regionID == UUID.Zero)
+                return false;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
-                cmd.CommandText = String.Format(@"UPDATE {0} SET 
+                cmd.CommandText = String.Format("UPDATE {0} SET \"RegionID\" = :regionID, \"LastSeen\" = now() WHERE \"SessionID\" = :sessionID", m_Realm);
-                                                [RegionID] = @RegionID
-                                        WHERE [SessionID] = @SessionID", m_Realm);
-                cmd.Parameters.Add(m_database.CreateParameter("@SessionID", sessionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("SessionID", sessionID));
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
                cmd.Connection = conn;
                conn.Open();
                if (cmd.ExecuteNonQuery() == 0)
@@ -102,8 +102,7 @@ namespace OpenSim.Data.MSSQL
        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
        {
-            PresenceData[] ret = Get("SecureSessionID",
+            PresenceData[] ret = Get("SecureSessionID", secureSessionID.ToString());
-                    secureSessionID.ToString());
            
            if (ret.Length == 0)
                return false;
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index 0d89706..b3076f0 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
@@ -38,45 +37,80 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using RegionFlags = OpenSim.Framework.RegionFlags;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL Interface for the Region Server.
+    /// A PGSQL Interface for the Region Server.
    /// </summary>
-    public class MSSQLRegionData : IRegionData
+    public class PGSQLRegionData : IRegionData
    {
        private string m_Realm;
        private List<string> m_ColumnNames = null;
        private string m_ConnectionString;
-        private MSSQLManager m_database;
+        private PGSQLManager m_database;
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public MSSQLRegionData(string connectionString, string realm) 
+        protected Dictionary<string, string> m_FieldTypes = new Dictionary<string, string>();
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        public PGSQLRegionData(string connectionString, string realm) 
        {
            m_Realm = realm;
            m_ConnectionString = connectionString;
-            m_database = new MSSQLManager(connectionString);
+            m_database = new PGSQLManager(connectionString);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
                conn.Open();
                Migration m = new Migration(conn, GetType().Assembly, "GridStore");
                m.Update();
            }
+            LoadFieldTypes();
         }
+        private void LoadFieldTypes()
+        {
+            m_FieldTypes = new Dictionary<string, string>();
+            string query = string.Format(@"select column_name,data_type
+                        from INFORMATION_SCHEMA.COLUMNS 
+                       where table_name = lower('{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
+                        m_FieldTypes.Add((string)rdr[0], (string)rdr[1]);
+                    }
+                }
+            }
+        }
        public List<RegionData> Get(string regionName, UUID scopeID)
        {
-            string sql = "select * from ["+m_Realm+"] where regionName like @regionName";
+            string sql = "select * from "+m_Realm+" where lower(\"regionName\") like lower(:regionName) ";
            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
+                sql += " and \"ScopeID\" = :scopeID";
-            sql += " order by regionName";
+            sql += " order by lower(\"regionName\")";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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("regionName", regionName));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                conn.Open();
                return RunCommand(cmd);
            }
@@ -84,16 +118,17 @@ namespace OpenSim.Data.MSSQL
        public RegionData Get(int posX, int posY, UUID scopeID)
        {
-            string sql = "select * from ["+m_Realm+"] where locX = @posX and locY = @posY";
+            string sql = "select * from "+m_Realm+" where \"locX\" = :posX and \"locY\" = :posY";
            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
+                sql += " and \"ScopeID\" = :scopeID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@posX", posX.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("posX", posX));
-                cmd.Parameters.Add(m_database.CreateParameter("@posY", posY.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", posY));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                conn.Open();
                List<RegionData> ret = RunCommand(cmd);
                if (ret.Count == 0)
@@ -105,14 +140,15 @@ namespace OpenSim.Data.MSSQL
        public RegionData Get(UUID regionID, UUID scopeID)
        {
-            string sql = "select * from ["+m_Realm+"] where uuid = @regionID";
+            string sql = "select * from "+m_Realm+" where uuid = :regionID";
            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
+                sql += " and \"ScopeID\" = :scopeID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@regionID", regionID));
+                cmd.Parameters.Add(m_database.CreateParameter("regionID", regionID));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                if (scopeID != UUID.Zero) 
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                conn.Open();
                List<RegionData> ret = RunCommand(cmd);
                if (ret.Count == 0)
@@ -124,28 +160,28 @@ namespace OpenSim.Data.MSSQL
        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";
+            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";
+                sql += " and \"ScopeID\" = :scopeID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@startX", startX));
+                cmd.Parameters.Add(m_database.CreateParameter("startX", startX));
-                cmd.Parameters.Add(m_database.CreateParameter("@startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
-                cmd.Parameters.Add(m_database.CreateParameter("@endX", endX));
+                cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
-                cmd.Parameters.Add(m_database.CreateParameter("@endY", endY));
+                cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                conn.Open();
                return RunCommand(cmd);
            }
        }
-        public List<RegionData> RunCommand(SqlCommand cmd)
+        public List<RegionData> RunCommand(NpgsqlCommand cmd)
        {
            List<RegionData> retList = new List<RegionData>();
-            SqlDataReader result = cmd.ExecuteReader();
+            NpgsqlDataReader result = cmd.ExecuteReader();
            while (result.Read())
            {
@@ -217,43 +253,46 @@ namespace OpenSim.Data.MSSQL
            string[] fields = new List<string>(data.Data.Keys).ToArray();
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
            {
-                string update = "update [" + m_Realm + "] set locX=@posX, locY=@posY, sizeX=@sizeX, sizeY=@sizeY ";
+                string update = "update " + m_Realm + " set \"locX\"=:posX, \"locY\"=:posY, \"sizeX\"=:sizeX, \"sizeY\"=:sizeY ";
                
                foreach (string field in fields)
                {
                    update += ", ";
-                    update += "[" + field + "] = @" + field;
+                    update += " \"" + field + "\" = :" + field;
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+                    if (m_FieldTypes.ContainsKey(field))
+                        cmd.Parameters.Add(m_database.CreateParameter(field, data.Data[field], m_FieldTypes[field]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter(field, data.Data[field]));
                }
-                update += " where uuid = @regionID";
+                update += " where uuid = :regionID";
                if (data.ScopeID != UUID.Zero)
-                    update += " and ScopeID = @scopeID";
+                    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("regionID", data.RegionID));
-                cmd.Parameters.Add(m_database.CreateParameter("@regionName", data.RegionName));
+                cmd.Parameters.Add(m_database.CreateParameter("regionName", data.RegionName));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", data.ScopeID));
-                cmd.Parameters.Add(m_database.CreateParameter("@posX", data.posX));
+                cmd.Parameters.Add(m_database.CreateParameter("posX", data.posX));
-                cmd.Parameters.Add(m_database.CreateParameter("@posY", data.posY));
+                cmd.Parameters.Add(m_database.CreateParameter("posY", data.posY));
-                cmd.Parameters.Add(m_database.CreateParameter("@sizeX", data.sizeX));
+                cmd.Parameters.Add(m_database.CreateParameter("sizeX", data.sizeX));
-                cmd.Parameters.Add(m_database.CreateParameter("@sizeY", data.sizeY));
+                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 insert = "insert into " + m_Realm + " (uuid, \"ScopeID\", \"locX\", \"locY\", \"sizeX\", \"sizeY\", \"regionName\", \"" +
-                                String.Join("], [", fields) +
+                                String.Join("\", \"", fields) +
-                                "]) values (@regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")";
+                                "\") values (:regionID, :scopeID, :posX, :posY, :sizeX, :sizeY, :regionName, :" + String.Join(", :", fields) + ")";
                        cmd.CommandText = insert;
@@ -266,13 +305,13 @@ namespace OpenSim.Data.MSSQL
                        }
                        catch (Exception ex)
                        {
-                            m_log.Warn("[MSSQL Grid]: Error inserting into Regions table: " + ex.Message + ", INSERT sql: " + insert);
+                            m_log.Warn("[PGSQL Grid]: Error inserting into Regions table: " + ex.Message + ", INSERT sql: " + insert);
                        }
                    }
                }
                catch (Exception ex)
                {
-                    m_log.Warn("[MSSQL Grid]: Error updating Regions table: " + ex.Message + ", UPDATE sql: " + update);
+                    m_log.Warn("[PGSQL Grid]: Error updating Regions table: " + ex.Message + ", UPDATE sql: " + update);
                }
            }
@@ -281,13 +320,14 @@ namespace OpenSim.Data.MSSQL
        public bool SetDataItem(UUID regionID, string item, string value)
        {
-            string sql = "update [" + m_Realm +
+            string sql = "update " + m_Realm +
-                    "] set [" + item + "] = @" + item + " where uuid = @UUID";
+                    " set \"" + item + "\" = :" + item + " where uuid = :UUID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            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("" + item, value));
-                cmd.Parameters.Add(m_database.CreateParameter("@UUID", regionID));
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
                    return true;
@@ -297,12 +337,12 @@ namespace OpenSim.Data.MSSQL
        public bool Delete(UUID regionID)
        {
-            string sql = "delete from [" + m_Realm +
+            string sql = "delete from " + m_Realm +
-                    "] where uuid = @UUID";
+                    " where uuid = :UUID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@UUID", regionID));
+                cmd.Parameters.Add(m_database.CreateParameter("UUID", regionID));
                conn.Open();
                if (cmd.ExecuteNonQuery() > 0)
                    return true;
@@ -315,6 +355,11 @@ namespace OpenSim.Data.MSSQL
            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);
@@ -331,14 +376,14 @@ namespace OpenSim.Data.MSSQL
        private List<RegionData> Get(int regionFlags, UUID scopeID)
        {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0";
+            string sql = "SELECT * FROM " + m_Realm + " WHERE (\"flags\" & " + regionFlags.ToString() + ") <> 0";
            if (scopeID != UUID.Zero)
-                sql += " AND ScopeID = @scopeID";
+                sql += " AND \"ScopeID\" = :scopeID";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                conn.Open();
                return RunCommand(cmd);
            }
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 17f42e1..77d87d4 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
@@ -37,15 +36,17 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Npgsql;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
    /// <summary>
-    /// A MSSQL Interface for the Region Server.
+    /// A PGSQL Interface for the Region Server.
    /// </summary>
-    public class MSSQLSimulationData : ISimulationDataStore
+    public class PGSQLSimulationData : ISimulationDataStore
    {
        private const string _migrationStore = "RegionStore";
+        private const string LogHeader = "[REGION DB PGSQL]";
        // private static FileSystemDataStore Instance = new FileSystemDataStore();
        private static readonly ILog _Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,18 +54,18 @@ namespace OpenSim.Data.MSSQL
        /// <summary>
        /// The database manager
        /// </summary>
-        private MSSQLManager _Database;
+        private PGSQLManager _Database;
        private string m_connectionString;
        protected virtual Assembly Assembly
        {
            get { return GetType().Assembly; }
        }
-        public MSSQLSimulationData()
+        public PGSQLSimulationData()
        {
        }
-        public MSSQLSimulationData(string connectionString)
+        public PGSQLSimulationData(string connectionString)
        {
            Initialise(connectionString);
        }
@@ -76,9 +77,9 @@ namespace OpenSim.Data.MSSQL
        public void Initialise(string connectionString)
        {
            m_connectionString = connectionString;
-            _Database = new MSSQLManager(connectionString);
+            _Database = new PGSQLManager(connectionString);
-            using (SqlConnection conn = new SqlConnection(connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(connectionString))
            {
                conn.Open();
                //New Migration settings
@@ -107,19 +108,19 @@ namespace OpenSim.Data.MSSQL
            Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
            SceneObjectGroup grp = null;
-            string sql = "SELECT *, " +
+            string sql = @"SELECT *, 
-                           "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
+                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort 
-                           "FROM prims " +
+                            FROM prims 
-                           "LEFT JOIN primshapes ON prims.UUID = primshapes.UUID " +
+                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID"" 
-                           "WHERE RegionUUID = @RegionUUID " +
+                            WHERE ""RegionUUID"" = :RegionUUID 
-                           "ORDER BY SceneGroupID asc, sort asc, LinkNumber asc";
+                            ORDER BY ""SceneGroupID"" asc, sort asc, ""LinkNumber"" asc";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
-                command.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID));
+                command.Parameters.Add(_Database.CreateParameter("regionUUID", regionUUID));
                conn.Open();
-                using (SqlDataReader reader = command.ExecuteReader())
+                using (NpgsqlDataReader reader = command.ExecuteReader())
                {
                    while (reader.Read())
                    {
@@ -179,12 +180,12 @@ namespace OpenSim.Data.MSSQL
            // list from DB of all prims which have items and
            // LoadItems only on those
            List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
-            string qry = "select distinct primID from primitems";
+            string qry = "select distinct \"primID\" from primitems";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(qry, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(qry, conn))
            {
                conn.Open();
-                using (SqlDataReader itemReader = command.ExecuteReader())
+                using (NpgsqlDataReader itemReader = command.ExecuteReader())
                {
                    while (itemReader.Read())
                    {
@@ -213,19 +214,19 @@ namespace OpenSim.Data.MSSQL
        /// <param name="allPrims">all prims with inventory on a region</param>
        private void LoadItems(List<SceneObjectPart> allPrimsWithInventory)
        {
-            string sql = "SELECT * FROM primitems WHERE PrimID = @PrimID";
+            string sql = @"SELECT * FROM primitems WHERE ""primID"" = :PrimID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
            {
                conn.Open();
                foreach (SceneObjectPart objectPart in allPrimsWithInventory)
                {
                    command.Parameters.Clear();
-                    command.Parameters.Add(_Database.CreateParameter("@PrimID", objectPart.UUID));
+                    command.Parameters.Add(_Database.CreateParameter("PrimID", objectPart.UUID));
                    List<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
-                    using (SqlDataReader reader = command.ExecuteReader())
+                    using (NpgsqlDataReader reader = command.ExecuteReader())
                    {
                        while (reader.Read())
                        {
@@ -257,43 +258,43 @@ namespace OpenSim.Data.MSSQL
            if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
                return;
-            _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Parts.Length);
+            //_Log.DebugFormat("[PGSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Parts.Length);
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                SqlTransaction transaction = conn.BeginTransaction();
+                NpgsqlTransaction transaction = conn.BeginTransaction();
                try
                {
                    foreach (SceneObjectPart sceneObjectPart in obj.Parts)
                    {
                        //Update prim
-                        using (SqlCommand sqlCommand = conn.CreateCommand())
+                        using (NpgsqlCommand sqlCommand = conn.CreateCommand())
                        {
                            sqlCommand.Transaction = transaction;
                            try
                            {
                                StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
                            }
-                            catch (SqlException sqlEx)
+                            catch (NpgsqlException sqlEx)
                            {
-                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.Line);
                                throw;
                            }
                        }
                        //Update primshapes
-                        using (SqlCommand sqlCommand = conn.CreateCommand())
+                        using (NpgsqlCommand sqlCommand = conn.CreateCommand())
                        {
                            sqlCommand.Transaction = transaction;
                            try
                            {
                                StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
                            }
-                            catch (SqlException sqlEx)
+                            catch (NpgsqlException sqlEx)
                            {
-                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.Line);
                                throw;
                            }
                        }
@@ -325,60 +326,59 @@ namespace OpenSim.Data.MSSQL
        /// <param name="sqlCommand">The SQL command with the transaction.</param>
        /// <param name="sceneGroupID">The scenegroup UUID.</param>
        /// <param name="regionUUID">The region UUID.</param>
-        private void StoreSceneObjectPrim(SceneObjectPart sceneObjectPart, SqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
+        private void StoreSceneObjectPrim(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
        {
            //Big query to update or insert a new prim.
-            //Note for SQL Server 2008 this could be simplified
+            
            string queryPrims = @"
-IF EXISTS (SELECT UUID FROM prims WHERE UUID = @UUID)
-    BEGIN
        UPDATE prims SET 
-            CreationDate = @CreationDate, Name = @Name, Text = @Text, Description = @Description, SitName = @SitName, 
+            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName, 
-            TouchName = @TouchName, ObjectFlags = @ObjectFlags, OwnerMask = @OwnerMask, NextOwnerMask = @NextOwnerMask, GroupMask = @GroupMask, 
+            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask, 
-            EveryoneMask = @EveryoneMask, BaseMask = @BaseMask, PositionX = @PositionX, PositionY = @PositionY, PositionZ = @PositionZ, 
+            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ, 
-            GroupPositionX = @GroupPositionX, GroupPositionY = @GroupPositionY, GroupPositionZ = @GroupPositionZ, VelocityX = @VelocityX, 
+            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX, 
-            VelocityY = @VelocityY, VelocityZ = @VelocityZ, AngularVelocityX = @AngularVelocityX, AngularVelocityY = @AngularVelocityY, 
+            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY, 
-            AngularVelocityZ = @AngularVelocityZ, AccelerationX = @AccelerationX, AccelerationY = @AccelerationY, 
+            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY, 
-            AccelerationZ = @AccelerationZ, RotationX = @RotationX, RotationY = @RotationY, RotationZ = @RotationZ, RotationW = @RotationW, 
+            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW, 
-            SitTargetOffsetX = @SitTargetOffsetX, SitTargetOffsetY = @SitTargetOffsetY, SitTargetOffsetZ = @SitTargetOffsetZ, 
+            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ, 
-            SitTargetOrientW = @SitTargetOrientW, SitTargetOrientX = @SitTargetOrientX, SitTargetOrientY = @SitTargetOrientY, 
+            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY, 
-            SitTargetOrientZ = @SitTargetOrientZ, RegionUUID = @RegionUUID, CreatorID = @CreatorID, OwnerID = @OwnerID, GroupID = @GroupID, 
+            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID, 
-            LastOwnerID = @LastOwnerID, SceneGroupID = @SceneGroupID, PayPrice = @PayPrice, PayButton1 = @PayButton1, PayButton2 = @PayButton2, 
+            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2, 
-            PayButton3 = @PayButton3, PayButton4 = @PayButton4, LoopedSound = @LoopedSound, LoopedSoundGain = @LoopedSoundGain, 
+            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain, 
-            TextureAnimation = @TextureAnimation, OmegaX = @OmegaX, OmegaY = @OmegaY, OmegaZ = @OmegaZ, CameraEyeOffsetX = @CameraEyeOffsetX, 
+            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX, 
-            CameraEyeOffsetY = @CameraEyeOffsetY, CameraEyeOffsetZ = @CameraEyeOffsetZ, CameraAtOffsetX = @CameraAtOffsetX, 
+            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX, 
-            CameraAtOffsetY = @CameraAtOffsetY, CameraAtOffsetZ = @CameraAtOffsetZ, ForceMouselook = @ForceMouselook, 
+            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook, 
-            ScriptAccessPin = @ScriptAccessPin, AllowedDrop = @AllowedDrop, DieAtEdge = @DieAtEdge, SalePrice = @SalePrice, 
+            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice, 
-            SaleType = @SaleType, ColorR = @ColorR, ColorG = @ColorG, ColorB = @ColorB, ColorA = @ColorA, ParticleSystem = @ParticleSystem, 
+            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem, 
-            ClickAction = @ClickAction, Material = @Material, CollisionSound = @CollisionSound, CollisionSoundVolume = @CollisionSoundVolume, PassTouches = @PassTouches,
+            ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
-            LinkNumber = @LinkNumber, MediaURL = @MediaURL
+            ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
-        WHERE UUID = @UUID
+            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution
-    END
+        WHERE ""UUID"" = :UUID ;
-ELSE
-    BEGIN
        INSERT INTO 
            prims (
-            UUID, CreationDate, Name, Text, Description, SitName, TouchName, ObjectFlags, OwnerMask, NextOwnerMask, GroupMask, 
+            ""UUID"", ""CreationDate"", ""Name"", ""Text"", ""Description"", ""SitName"", ""TouchName"", ""ObjectFlags"", ""OwnerMask"", ""NextOwnerMask"", ""GroupMask"",
-            EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, 
+            ""EveryoneMask"", ""BaseMask"", ""PositionX"", ""PositionY"", ""PositionZ"", ""GroupPositionX"", ""GroupPositionY"", ""GroupPositionZ"", ""VelocityX"", 
-            VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, 
+            ""VelocityY"", ""VelocityZ"", ""AngularVelocityX"", ""AngularVelocityY"", ""AngularVelocityZ"", ""AccelerationX"", ""AccelerationY"", ""AccelerationZ"", 
-            RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, 
+            ""RotationX"", ""RotationY"", ""RotationZ"", ""RotationW"", ""SitTargetOffsetX"", ""SitTargetOffsetY"", ""SitTargetOffsetZ"", ""SitTargetOrientW"", 
-            SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ, RegionUUID, CreatorID, OwnerID, GroupID, LastOwnerID, SceneGroupID, 
+            ""SitTargetOrientX"", ""SitTargetOrientY"", ""SitTargetOrientZ"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"", 
-            PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, 
+            ""PayPrice"", ""PayButton1"", ""PayButton2"", ""PayButton3"", ""PayButton4"", ""LoopedSound"", ""LoopedSoundGain"", ""TextureAnimation"", ""OmegaX"", 
-            OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, 
+            ""OmegaY"", ""OmegaZ"", ""CameraEyeOffsetX"", ""CameraEyeOffsetY"", ""CameraEyeOffsetZ"", ""CameraAtOffsetX"", ""CameraAtOffsetY"", ""CameraAtOffsetZ"", 
-            ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, 
+            ""ForceMouselook"", ""ScriptAccessPin"", ""AllowedDrop"", ""DieAtEdge"", ""SalePrice"", ""SaleType"", ""ColorR"", ""ColorG"", ""ColorB"", ""ColorA"", 
-            ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, PassTouches, LinkNumber, MediaURL
+            ""ParticleSystem"", ""ClickAction"", ""Material"", ""CollisionSound"", ""CollisionSoundVolume"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
-            ) VALUES (
+            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution""
-            @UUID, @CreationDate, @Name, @Text, @Description, @SitName, @TouchName, @ObjectFlags, @OwnerMask, @NextOwnerMask, @GroupMask, 
+            ) Select 
-            @EveryoneMask, @BaseMask, @PositionX, @PositionY, @PositionZ, @GroupPositionX, @GroupPositionY, @GroupPositionZ, @VelocityX, 
+            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :OwnerMask, :NextOwnerMask, :GroupMask, 
-            @VelocityY, @VelocityZ, @AngularVelocityX, @AngularVelocityY, @AngularVelocityZ, @AccelerationX, @AccelerationY, @AccelerationZ, 
+            :EveryoneMask, :BaseMask, :PositionX, :PositionY, :PositionZ, :GroupPositionX, :GroupPositionY, :GroupPositionZ, :VelocityX, 
-            @RotationX, @RotationY, @RotationZ, @RotationW, @SitTargetOffsetX, @SitTargetOffsetY, @SitTargetOffsetZ, @SitTargetOrientW, 
+            :VelocityY, :VelocityZ, :AngularVelocityX, :AngularVelocityY, :AngularVelocityZ, :AccelerationX, :AccelerationY, :AccelerationZ, 
-            @SitTargetOrientX, @SitTargetOrientY, @SitTargetOrientZ, @RegionUUID, @CreatorID, @OwnerID, @GroupID, @LastOwnerID, @SceneGroupID, 
+            :RotationX, :RotationY, :RotationZ, :RotationW, :SitTargetOffsetX, :SitTargetOffsetY, :SitTargetOffsetZ, :SitTargetOrientW, 
-            @PayPrice, @PayButton1, @PayButton2, @PayButton3, @PayButton4, @LoopedSound, @LoopedSoundGain, @TextureAnimation, @OmegaX, 
+            :SitTargetOrientX, :SitTargetOrientY, :SitTargetOrientZ, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID, 
-            @OmegaY, @OmegaZ, @CameraEyeOffsetX, @CameraEyeOffsetY, @CameraEyeOffsetZ, @CameraAtOffsetX, @CameraAtOffsetY, @CameraAtOffsetZ, 
+            :PayPrice, :PayButton1, :PayButton2, :PayButton3, :PayButton4, :LoopedSound, :LoopedSoundGain, :TextureAnimation, :OmegaX, 
-            @ForceMouselook, @ScriptAccessPin, @AllowedDrop, @DieAtEdge, @SalePrice, @SaleType, @ColorR, @ColorG, @ColorB, @ColorA, 
+            :OmegaY, :OmegaZ, :CameraEyeOffsetX, :CameraEyeOffsetY, :CameraEyeOffsetZ, :CameraAtOffsetX, :CameraAtOffsetY, :CameraAtOffsetZ, 
-            @ParticleSystem, @ClickAction, @Material, @CollisionSound, @CollisionSoundVolume, @PassTouches, @LinkNumber, @MediaURL
+            :ForceMouselook, :ScriptAccessPin, :AllowedDrop, :DieAtEdge, :SalePrice, :SaleType, :ColorR, :ColorG, :ColorB, :ColorA, 
-            )
+            :ParticleSystem, :ClickAction, :Material, :CollisionSound, :CollisionSoundVolume, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
-    END";
+            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution
+            where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
+        ";
            //Set commandtext.
            sqlCommand.CommandText = queryPrims;
@@ -396,35 +396,32 @@ ELSE
        /// <param name="sqlCommand">The SQL command with the transaction.</param>
        /// <param name="sceneGroupID">The scenegroup UUID.</param>
        /// <param name="regionUUID">The region UUID.</param>
-        private void StoreSceneObjectPrimShapes(SceneObjectPart sceneObjectPart, SqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
+        private void StoreSceneObjectPrimShapes(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
        {
            //Big query to or insert or update primshapes
-            //Note for SQL Server 2008 this can be simplified
+            
            string queryPrimShapes = @"
-IF EXISTS (SELECT UUID FROM primshapes WHERE UUID = @UUID)
-    BEGIN
        UPDATE primshapes SET 
-            Shape = @Shape, ScaleX = @ScaleX, ScaleY = @ScaleY, ScaleZ = @ScaleZ, PCode = @PCode, PathBegin = @PathBegin, 
+            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin, 
-            PathEnd = @PathEnd, PathScaleX = @PathScaleX, PathScaleY = @PathScaleY, PathShearX = @PathShearX, PathShearY = @PathShearY, 
+            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY, 
-            PathSkew = @PathSkew, PathCurve = @PathCurve, PathRadiusOffset = @PathRadiusOffset, PathRevolutions = @PathRevolutions, 
+            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions, 
-            PathTaperX = @PathTaperX, PathTaperY = @PathTaperY, PathTwist = @PathTwist, PathTwistBegin = @PathTwistBegin, 
+            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin, 
-            ProfileBegin = @ProfileBegin, ProfileEnd = @ProfileEnd, ProfileCurve = @ProfileCurve, ProfileHollow = @ProfileHollow, 
+            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow, 
-            Texture = @Texture, ExtraParams = @ExtraParams, State = @State, Media = @Media
+            ""Texture"" = :Texture, ""ExtraParams"" = :ExtraParams, ""State"" = :State, ""Media"" = :Media
-        WHERE UUID = @UUID
+        WHERE ""UUID"" = :UUID ;
-    END
-ELSE
-    BEGIN
        INSERT INTO 
            primshapes (
-            UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, 
+            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"", 
-            PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, 
+            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"", 
-            ProfileEnd, ProfileCurve, ProfileHollow, Texture, ExtraParams, State, Media
+            ""ProfileEnd"", ""ProfileCurve"", ""ProfileHollow"", ""Texture"", ""ExtraParams"", ""State"", ""Media""
-            ) VALUES (
+            ) 
-            @UUID, @Shape, @ScaleX, @ScaleY, @ScaleZ, @PCode, @PathBegin, @PathEnd, @PathScaleX, @PathScaleY, @PathShearX, @PathShearY, 
+            Select
-            @PathSkew, @PathCurve, @PathRadiusOffset, @PathRevolutions, @PathTaperX, @PathTaperY, @PathTwist, @PathTwistBegin, @ProfileBegin, 
+            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY, 
-            @ProfileEnd, @ProfileCurve, @ProfileHollow, @Texture, @ExtraParams, @State, @Media
+            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin, 
-            )
+            :ProfileEnd, :ProfileCurve, :ProfileHollow, :Texture, :ExtraParams, :State, :Media
-    END";
+        where not EXISTS (SELECT ""UUID"" FROM primshapes WHERE ""UUID"" = :UUID);
+        ";
            //Set commandtext.
            sqlCommand.CommandText = queryPrimShapes;
@@ -445,18 +442,18 @@ ELSE
        /// <param name="regionUUID">regionUUID (is this used anyway</param>
        public void RemoveObject(UUID objectID, UUID regionUUID)
        {
-            _Log.InfoFormat("[MSSQL]: Removing obj: {0} from region: {1}", objectID, regionUUID);
+            //_Log.InfoFormat("[PGSQL]: Removing obj: {0} from region: {1}", objectID, regionUUID);
            //Remove from prims and primsitem table
-            string sqlPrims = "DELETE FROM PRIMS WHERE SceneGroupID = @objectID";
+            string sqlPrims = @"DELETE FROM PRIMS WHERE ""SceneGroupID"" = :objectID";
-            string sqlPrimItems = "DELETE FROM PRIMITEMS WHERE primID in (SELECT UUID FROM PRIMS WHERE SceneGroupID = @objectID)";
+            string sqlPrimItems = @"DELETE FROM PRIMITEMS WHERE ""primID"" in (SELECT ""UUID"" FROM PRIMS WHERE ""SceneGroupID"" = :objectID)";
-            string sqlPrimShapes = "DELETE FROM PRIMSHAPES WHERE uuid in (SELECT UUID FROM PRIMS WHERE SceneGroupID = @objectID)";
+            string sqlPrimShapes = @"DELETE FROM PRIMSHAPES WHERE ""UUID"" in (SELECT ""UUID"" FROM PRIMS WHERE ""SceneGroupID"" = :objectID)";
            lock (_Database)
            {
                //Using the non transaction mode.
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                {
                    cmd.Connection = conn;
                    cmd.CommandText = sqlPrimShapes;
@@ -482,31 +479,31 @@ ELSE
        {
            //_Log.InfoFormat("[REGION DB: Persisting Prim Inventory with prim ID {0}", primID);
-            //Statement from MySQL section!
+            //Statement from PGSQL section!
            // For now, we're just going to crudely remove all the previous inventory items
            // no matter whether they have changed or not, and replace them with the current set.
            //Delete everything from PrimID
            //TODO add index on PrimID in DB, if not already exist
-            string sql = "DELETE PRIMITEMS WHERE primID = @primID";
+            string sql = @"delete from primitems where ""primID"" = :primID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@primID", primID));
+                cmd.Parameters.Add(_Database.CreateParameter("primID", primID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
            sql =
                @"INSERT INTO primitems (
-            itemID,primID,assetID,parentFolderID,invType,assetType,name,description,creationDate,creatorID,ownerID,lastOwnerID,groupID,
+            ""itemID"",""primID"",""assetID"",""parentFolderID"",""invType"",""assetType"",""name"",""description"",""creationDate"",""creatorID"",""ownerID"",""lastOwnerID"",""groupID"",
-            nextPermissions,currentPermissions,basePermissions,everyonePermissions,groupPermissions,flags) 
+            ""nextPermissions"",""currentPermissions"",""basePermissions"",""everyonePermissions"",""groupPermissions"",""flags"") 
-            VALUES (@itemID,@primID,@assetID,@parentFolderID,@invType,@assetType,@name,@description,@creationDate,@creatorID,@ownerID,
+            VALUES (:itemID,:primID,:assetID,:parentFolderID,:invType,:assetType,:name,:description,:creationDate,:creatorID,:ownerID,
-            @lastOwnerID,@groupID,@nextPermissions,@currentPermissions,@basePermissions,@everyonePermissions,@groupPermissions,@flags)";
+            :lastOwnerID,:groupID,:nextPermissions,:currentPermissions,:basePermissions,:everyonePermissions,:groupPermissions,:flags)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                conn.Open();
                foreach (TaskInventoryItem taskItem in items)
@@ -527,43 +524,54 @@ ELSE
        /// <returns></returns>
        public double[,] LoadTerrain(UUID regionID)
        {
-            double[,] terrain = new double[(int)Constants.RegionSize, (int)Constants.RegionSize];
+            double[,] ret = null;
-            terrain.Initialize();
+            TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
+            if (terrData != null)
+                ret = terrData.GetDoubles();
+            return ret;
+        }
+        // Returns 'null' if region not found
+        public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            TerrainData terrData = null;
-            string sql = "select top 1 RegionUUID, Revision, Heightfield from terrain where RegionUUID = @RegionUUID order by Revision desc";
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain 
+                            where ""RegionUUID"" = :RegionUUID order by ""Revision"" desc limit 1; ";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
-                // MySqlParameter param = new MySqlParameter();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
-                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
                {
-                    int rev;
+                    // PGSqlParameter param = new PGSqlParameter();
-                    if (reader.Read())
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    conn.Open();
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                    {
-                        MemoryStream str = new MemoryStream((byte[])reader["Heightfield"]);
+                        int rev;
-                        BinaryReader br = new BinaryReader(str);
+                        if (reader.Read())
-                        for (int x = 0; x < (int)Constants.RegionSize; x++)
                        {
-                            for (int y = 0; y < (int)Constants.RegionSize; y++)
+                            rev = Convert.ToInt32(reader["Revision"]);
-                            {
+                            byte[] blob = (byte[])reader["Heightfield"];
-                                terrain[x, y] = br.ReadDouble();
+                            terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
-                            }
                        }
-                        rev = (int)reader["Revision"];
+                        else
-                    }
+                        {
-                    else
+                            _Log.Info("[REGION DB]: No terrain found for region");
-                    {
+                            return null;
-                        _Log.Info("[REGION DB]: No terrain found for region");
+                        }
-                        return null;
+                        _Log.Info("[REGION DB]: Loaded terrain revision r" + rev);
                    }
-                    _Log.Info("[REGION DB]: Loaded terrain revision r" + rev);
                }
            }
-            return terrain;
+            return terrData;
+        }
+        // Legacy entry point for when terrain was always a 256x256 heightmap
+        public void StoreTerrain(double[,] terrain, UUID regionID)
+        {
+            StoreTerrain(new HeightmapTerrainData(terrain), regionID);
        }
        /// <summary>
@@ -571,33 +579,43 @@ ELSE
        /// </summary>
        /// <param name="terrain">terrain map data.</param>
        /// <param name="regionID">regionID.</param>
-        public void StoreTerrain(double[,] terrain, UUID regionID)
+        public void StoreTerrain(TerrainData terrData, UUID regionID)
        {
-            int revision = Util.UnixTimeSinceEpoch();
            //Delete old terrain map
-            string sql = "delete from terrain where RegionUUID=@RegionUUID";
+            string sql = @"delete from terrain where ""RegionUUID""=:RegionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                conn.Open();
+                {
-                cmd.ExecuteNonQuery();
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                    _Log.InfoFormat("{0} Deleted terrain revision id = {1}", LogHeader, regionID);
+                }
            }
-            sql = "insert into terrain(RegionUUID, Revision, Heightfield) values(@RegionUUID, @Revision, @Heightfield)";
+            int terrainDBRevision;
+            Array terrainDBblob;
+            terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+            sql = @"insert into terrain(""RegionUUID"", ""Revision"", ""Heightfield"") values(:RegionUUID, :Revision, :Heightfield)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
-                cmd.Parameters.Add(_Database.CreateParameter("@Revision", revision));
+                {
-                cmd.Parameters.Add(_Database.CreateParameter("@Heightfield", serializeTerrain(terrain)));
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
-                conn.Open();
+                    cmd.Parameters.Add(_Database.CreateParameter("Revision", terrainDBRevision));
-                cmd.ExecuteNonQuery();
+                    cmd.Parameters.Add(_Database.CreateParameter("Heightfield", terrainDBblob));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+                    _Log.InfoFormat("{0} Stored terrain id = {1}, terrainSize = <{2},{3}>",
+                                    LogHeader, regionID, terrData.SizeX, terrData.SizeY);
+                }
            }
-            _Log.Info("[REGION DB]: Stored terrain revision r " + revision);
        }
        /// <summary>
@@ -609,15 +627,15 @@ ELSE
        {
            List<LandData> LandDataForRegion = new List<LandData>();
-            string sql = "select * from land where RegionUUID = @RegionUUID";
+            string sql = @"select * from land where ""RegionUUID"" = :RegionUUID";
            //Retrieve all land data from region
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
                conn.Open();
-                using (SqlDataReader readerLandData = cmd.ExecuteReader())
+                using (NpgsqlDataReader readerLandData = cmd.ExecuteReader())
                {
                    while (readerLandData.Read())
                    {
@@ -629,13 +647,13 @@ ELSE
            //Retrieve all accesslist data for all landdata
            foreach (LandData LandData in LandDataForRegion)
            {
-                sql = "select * from landaccesslist where LandUUID = @LandUUID";
+                sql = @"select * from landaccesslist where ""LandUUID"" = :LandUUID";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID));
+                    cmd.Parameters.Add(_Database.CreateParameter("LandUUID", LandData.GlobalID));
                    conn.Open();
-                    using (SqlDataReader readerAccessList = cmd.ExecuteReader())
+                    using (NpgsqlDataReader readerAccessList = cmd.ExecuteReader())
                    {
                        while (readerAccessList.Read())
                        {
@@ -656,29 +674,33 @@ ELSE
        public void StoreLandObject(ILandObject parcel)
        {
            //As this is only one record in land table I just delete all and then add a new record.
-            //As the delete landaccess is already in the mysql code
+            //As the delete landaccess is already in the pgsql code
            //Delete old values
            RemoveLandObject(parcel.LandData.GlobalID);
            //Insert new values
-            string sql = @"INSERT INTO [land] 
+            string sql = @"INSERT INTO land
-([UUID],[RegionUUID],[LocalLandID],[Bitmap],[Name],[Description],[OwnerUUID],[IsGroupOwned],[Area],[AuctionID],[Category],[ClaimDate],[ClaimPrice],[GroupUUID],[SalePrice],[LandStatus],[LandFlags],[LandingType],[MediaAutoScale],[MediaTextureUUID],[MediaURL],[MusicURL],[PassHours],[PassPrice],[SnapshotUUID],[UserLocationX],[UserLocationY],[UserLocationZ],[UserLookAtX],[UserLookAtY],[UserLookAtZ],[AuthbuyerID],[OtherCleanTime])
+                (""UUID"",""RegionUUID"",""LocalLandID"",""Bitmap"",""Name"",""Description"",""OwnerUUID"",""IsGroupOwned"",""Area"",""AuctionID"",""Category"",""ClaimDate"",""ClaimPrice"",
-VALUES
+                 ""GroupUUID"",""SalePrice"",""LandStatus"",""LandFlags"",""LandingType"",""MediaAutoScale"",""MediaTextureUUID"",""MediaURL"",""MusicURL"",""PassHours"",""PassPrice"",
-(@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime)";
+                 ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"")
+                VALUES
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+                (:UUID,:RegionUUID,:LocalLandID,:Bitmap,:Name,:Description,:OwnerUUID,:IsGroupOwned,:Area,:AuctionID,:Category,:ClaimDate,:ClaimPrice,
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+                 :GroupUUID,:SalePrice,:LandStatus,:LandFlags,:LandingType,:MediaAutoScale,:MediaTextureUUID,:MediaURL,:MusicURL,:PassHours,:PassPrice,
+                 :SnapshotUUID,:UserLocationX,:UserLocationY,:UserLocationZ,:UserLookAtX,:UserLookAtY,:UserLookAtZ,:AuthbuyerID,:OtherCleanTime)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
-            sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags],[Expires]) VALUES (@LandUUID,@AccessUUID,@Flags,@Expires)";
+            sql = @"INSERT INTO landaccesslist (""LandUUID"",""AccessUUID"",""LandFlags"",""Expires"") VALUES (:LandUUID,:AccessUUID,:Flags,:Expires)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                conn.Open();
                foreach (LandAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
@@ -697,19 +719,19 @@ VALUES
        /// <param name="globalID">UUID of landobject</param>
        public void RemoveLandObject(UUID globalID)
        {
-            string sql = "delete from land where UUID=@UUID";
+            string sql = @"delete from land where ""UUID""=:UUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@UUID", globalID));
+                cmd.Parameters.Add(_Database.CreateParameter("UUID", globalID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
-            sql = "delete from landaccesslist where LandUUID=@UUID";
+            sql = @"delete from landaccesslist where ""LandUUID""=:UUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@UUID", globalID));
+                cmd.Parameters.Add(_Database.CreateParameter("UUID", globalID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
@@ -718,13 +740,15 @@ VALUES
        {
            RegionLightShareData nWP = new RegionLightShareData();
            nWP.OnSave += StoreRegionWindlightSettings;
-            string sql = "select * from [regionwindlight] where region_id = @regionID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = @"select * from regionwindlight where ""region_id"" = :regionID";
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@regionID", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID.ToString() ));
                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
                {
                    if (!result.Read())
                    {
@@ -807,27 +831,28 @@ VALUES
        public void RemoveRegionWindlightSettings(UUID regionID)
        {
-            string sql = "delete from [regionwindlight] where region_id = @region_id";
+            string sql = @"delete from regionwindlight where ""region_id"" = :region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                conn.Open();
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionID));
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID.ToString()));
                cmd.ExecuteNonQuery();
            }
        }
        public void StoreRegionWindlightSettings(RegionLightShareData wl)
        {
-            string sql = "select count (region_id) from regionwindlight where region_id = @region_id";
+            string sql = @"select region_id from regionwindlight where ""region_id"" = :region_id limit 1;";
            bool exists = false;
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
-                    exists = (int)cmd.ExecuteScalar() > 0;
+                    NpgsqlDataReader dr = cmd.ExecuteReader();
+                    exists = dr.Read();
                }
            }
            if (exists)
@@ -836,140 +861,141 @@ VALUES
            }
            // sql insert
-            sql = @"INSERT INTO [regionwindlight]
+            sql = @"INSERT INTO regionwindlight
-                       ([region_id]
+                       (region_id
-                       ,[water_color_r]
+                       ,water_color_r
-                       ,[water_color_g]
+                       ,water_color_g
-                       ,[water_color_b]
+                       ,water_color_b
-                       ,[water_fog_density_exponent]
+                       ,water_fog_density_exponent
-                       ,[underwater_fog_modifier]
+                       ,underwater_fog_modifier
-                       ,[reflection_wavelet_scale_1]
+                       ,reflection_wavelet_scale_1
-                       ,[reflection_wavelet_scale_2]
+                       ,reflection_wavelet_scale_2
-                       ,[reflection_wavelet_scale_3]
+                       ,reflection_wavelet_scale_3
-                       ,[fresnel_scale]
+                       ,fresnel_scale
-                       ,[fresnel_offset]
+                       ,fresnel_offset
-                       ,[refract_scale_above]
+                       ,refract_scale_above
-                       ,[refract_scale_below]
+                       ,refract_scale_below
-                       ,[blur_multiplier]
+                       ,blur_multiplier
-                       ,[big_wave_direction_x]
+                       ,big_wave_direction_x
-                       ,[big_wave_direction_y]
+                       ,big_wave_direction_y
-                       ,[little_wave_direction_x]
+                       ,little_wave_direction_x
-                       ,[little_wave_direction_y]
+                       ,little_wave_direction_y
-                       ,[normal_map_texture]
+                       ,normal_map_texture
-                       ,[horizon_r]
+                       ,horizon_r
-                       ,[horizon_g]
+                       ,horizon_g
-                       ,[horizon_b]
+                       ,horizon_b
-                       ,[horizon_i]
+                       ,horizon_i
-                       ,[haze_horizon]
+                       ,haze_horizon
-                       ,[blue_density_r]
+                       ,blue_density_r
-                       ,[blue_density_g]
+                       ,blue_density_g
-                       ,[blue_density_b]
+                       ,blue_density_b
-                       ,[blue_density_i]
+                       ,blue_density_i
-                       ,[haze_density]
+                       ,haze_density
-                       ,[density_multiplier]
+                       ,density_multiplier
-                       ,[distance_multiplier]
+                       ,distance_multiplier
-                       ,[max_altitude]
+                       ,max_altitude
-                       ,[sun_moon_color_r]
+                       ,sun_moon_color_r
-                       ,[sun_moon_color_g]
+                       ,sun_moon_color_g
-                       ,[sun_moon_color_b]
+                       ,sun_moon_color_b
-                       ,[sun_moon_color_i]
+                       ,sun_moon_color_i
-                       ,[sun_moon_position]
+                       ,sun_moon_position
-                       ,[ambient_r]
+                       ,ambient_r
-                       ,[ambient_g]
+                       ,ambient_g
-                       ,[ambient_b]
+                       ,ambient_b
-                       ,[ambient_i]
+                       ,ambient_i
-                       ,[east_angle]
+                       ,east_angle
-                       ,[sun_glow_focus]
+                       ,sun_glow_focus
-                       ,[sun_glow_size]
+                       ,sun_glow_size
-                       ,[scene_gamma]
+                       ,scene_gamma
-                       ,[star_brightness]
+                       ,star_brightness
-                       ,[cloud_color_r]
+                       ,cloud_color_r
-                       ,[cloud_color_g]
+                       ,cloud_color_g
-                       ,[cloud_color_b]
+                       ,cloud_color_b
-                       ,[cloud_color_i]
+                       ,cloud_color_i
-                       ,[cloud_x]
+                       ,cloud_x
-                       ,[cloud_y]
+                       ,cloud_y
-                       ,[cloud_density]
+                       ,cloud_density
-                       ,[cloud_coverage]
+                       ,cloud_coverage
-                       ,[cloud_scale]
+                       ,cloud_scale
-                       ,[cloud_detail_x]
+                       ,cloud_detail_x
-                       ,[cloud_detail_y]
+                       ,cloud_detail_y
-                       ,[cloud_detail_density]
+                       ,cloud_detail_density
-                       ,[cloud_scroll_x]
+                       ,cloud_scroll_x
-                       ,[cloud_scroll_x_lock]
+                       ,cloud_scroll_x_lock
-                       ,[cloud_scroll_y]
+                       ,cloud_scroll_y
-                       ,[cloud_scroll_y_lock]
+                       ,cloud_scroll_y_lock
-                       ,[draw_classic_clouds])
+                       ,draw_classic_clouds)
                 VALUES
-                       (@region_id
+                       (:region_id
-                       ,@water_color_r
+                       ,:water_color_r
-                       ,@water_color_g
+                       ,:water_color_g
-                       ,@water_color_b
+                       ,:water_color_b
-                       ,@water_fog_density_exponent
+                       ,:water_fog_density_exponent
-                       ,@underwater_fog_modifier
+                       ,:underwater_fog_modifier
-                       ,@reflection_wavelet_scale_1
+                       ,:reflection_wavelet_scale_1
-                       ,@reflection_wavelet_scale_2
+                       ,:reflection_wavelet_scale_2
-                       ,@reflection_wavelet_scale_3
+                       ,:reflection_wavelet_scale_3
-                       ,@fresnel_scale
+                       ,:fresnel_scale
-                       ,@fresnel_offset
+                       ,:fresnel_offset
-                       ,@refract_scale_above
+                       ,:refract_scale_above
-                       ,@refract_scale_below
+                       ,:refract_scale_below
-                       ,@blur_multiplier
+                       ,:blur_multiplier
-                       ,@big_wave_direction_x
+                       ,:big_wave_direction_x
-                       ,@big_wave_direction_y
+                       ,:big_wave_direction_y
-                       ,@little_wave_direction_x
+                       ,:little_wave_direction_x
-                       ,@little_wave_direction_y
+                       ,:little_wave_direction_y
-                       ,@normal_map_texture
+                       ,:normal_map_texture
-                       ,@horizon_r
+                       ,:horizon_r
-                       ,@horizon_g
+                       ,:horizon_g
-                       ,@horizon_b
+                       ,:horizon_b
-                       ,@horizon_i
+                       ,:horizon_i
-                       ,@haze_horizon
+                       ,:haze_horizon
-                       ,@blue_density_r
+                       ,:blue_density_r
-                       ,@blue_density_g
+                       ,:blue_density_g
-                       ,@blue_density_b
+                       ,:blue_density_b
-                       ,@blue_density_i
+                       ,:blue_density_i
-                       ,@haze_density
+                       ,:haze_density
-                       ,@density_multiplier
+                       ,:density_multiplier
-                       ,@distance_multiplier
+                       ,:distance_multiplier
-                       ,@max_altitude
+                       ,:max_altitude
-                       ,@sun_moon_color_r
+                       ,:sun_moon_color_r
-                       ,@sun_moon_color_g
+                       ,:sun_moon_color_g
-                       ,@sun_moon_color_b
+                       ,:sun_moon_color_b
-                       ,@sun_moon_color_i
+                       ,:sun_moon_color_i
-                       ,@sun_moon_position
+                       ,:sun_moon_position
-                       ,@ambient_r
+                       ,:ambient_r
-                       ,@ambient_g
+                       ,:ambient_g
-                       ,@ambient_b
+                       ,:ambient_b
-                       ,@ambient_i
+                       ,:ambient_i
-                       ,@east_angle
+                       ,:east_angle
-                       ,@sun_glow_focus
+                       ,:sun_glow_focus
-                       ,@sun_glow_size
+                       ,:sun_glow_size
-                       ,@scene_gamma
+                       ,:scene_gamma
-                       ,@star_brightness
+                       ,:star_brightness
-                       ,@cloud_color_r
+                       ,:cloud_color_r
-                       ,@cloud_color_g
+                       ,:cloud_color_g
-                       ,@cloud_color_b
+                       ,:cloud_color_b
-                       ,@cloud_color_i
+                       ,:cloud_color_i
-                       ,@cloud_x
+                       ,:cloud_x
-                       ,@cloud_y
+                       ,:cloud_y
-                       ,@cloud_density
+                       ,:cloud_density
-                       ,@cloud_coverage
+                       ,:cloud_coverage
-                       ,@cloud_scale
+                       ,:cloud_scale
-                       ,@cloud_detail_x
+                       ,:cloud_detail_x
-                       ,@cloud_detail_y
+                       ,:cloud_detail_y
-                       ,@cloud_detail_density
+                       ,:cloud_detail_density
-                       ,@cloud_scroll_x
+                       ,:cloud_scroll_x
-                       ,@cloud_scroll_x_lock
+                       ,:cloud_scroll_x_lock
-                       ,@cloud_scroll_y
+                       ,:cloud_scroll_y
-                       ,@cloud_scroll_y_lock
+                       ,:cloud_scroll_y_lock
-                       ,@draw_classic_clouds)";
+                       ,:draw_classic_clouds);";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
            {
                conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString()));
                    cmd.Parameters.Add(_Database.CreateParameter("water_color_r", wl.waterColor.X));
                    cmd.Parameters.Add(_Database.CreateParameter("water_color_g", wl.waterColor.Y));
                    cmd.Parameters.Add(_Database.CreateParameter("water_color_b", wl.waterColor.Z));
@@ -987,7 +1013,7 @@ VALUES
                    cmd.Parameters.Add(_Database.CreateParameter("big_wave_direction_y", wl.bigWaveDirection.Y));
                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_x", wl.littleWaveDirection.X));
                    cmd.Parameters.Add(_Database.CreateParameter("little_wave_direction_y", wl.littleWaveDirection.Y));
-                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture));
+                    cmd.Parameters.Add(_Database.CreateParameter("normal_map_texture", wl.normalMapTexture.ToString()));
                    cmd.Parameters.Add(_Database.CreateParameter("horizon_r", wl.horizon.X));
                    cmd.Parameters.Add(_Database.CreateParameter("horizon_g", wl.horizon.Y));
                    cmd.Parameters.Add(_Database.CreateParameter("horizon_b", wl.horizon.Z));
@@ -1185,13 +1211,13 @@ VALUES
        #region Environment Settings
        public string LoadRegionEnvironmentSettings(UUID regionUUID)
        {
-            string sql = "select * from [regionenvironment] where region_id = @region_id";
+            string sql = "select * from regionenvironment where region_id = :region_id";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
                {
                    if (!result.Read())
                    {
@@ -1208,24 +1234,23 @@ VALUES
        public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
        {
            {
-                string sql = "DELETE FROM [regionenvironment] WHERE region_id = @region_id";
+                string sql = "DELETE FROM regionenvironment WHERE region_id = :region_id ;";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
                    conn.Open();
                    cmd.ExecuteNonQuery();
                }
-                sql = "INSERT INTO [regionenvironment] (region_id, llsd_settings) VALUES (@region_id, @llsd_settings)";
+                sql = "INSERT INTO regionenvironment (region_id, llsd_settings) VALUES (:region_id, :llsd_settings) ;";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@llsd_settings", settings));
+                    cmd.Parameters.Add(_Database.CreateParameter("llsd_settings", settings));
                    conn.Open();
                    cmd.ExecuteNonQuery();
@@ -1235,11 +1260,11 @@ VALUES
        public void RemoveRegionEnvironmentSettings(UUID regionUUID)
        {
-            string sql = "delete from [regionenvironment] where region_id = @region_id";
+            string sql = "delete from regionenvironment where region_id = :region_id ;";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@region_id", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("region_id", regionUUID));
                conn.Open();
                cmd.ExecuteNonQuery();
@@ -1254,14 +1279,14 @@ VALUES
        /// <returns></returns>
        public RegionSettings LoadRegionSettings(UUID regionUUID)
        {
-            string sql = "select * from regionsettings where regionUUID = @regionUUID";
+            string sql = @"select * from regionsettings where ""regionUUID"" = :regionUUID";
            RegionSettings regionSettings;
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("regionUUID", regionUUID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -1294,11 +1319,11 @@ VALUES
        {
            //Little check if regionUUID already exist in DB
            string regionUUID;
-            string sql = "SELECT regionUUID FROM regionsettings WHERE regionUUID = @regionUUID";
+            string sql = @"SELECT ""regionUUID"" FROM regionsettings WHERE ""regionUUID"" = :regionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionSettings.RegionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("regionUUID", regionSettings.RegionUUID));
                conn.Open();
                regionUUID = cmd.ExecuteScalar().ToString();
            }
@@ -1311,20 +1336,22 @@ VALUES
            {
                //This method only updates region settings!!! First call LoadRegionSettings to create new region settings in DB
                sql =
-                   @"UPDATE [regionsettings] SET [block_terraform] = @block_terraform ,[block_fly] = @block_fly ,[allow_damage] = @allow_damage 
+                   @"UPDATE regionsettings SET block_terraform = :block_terraform ,block_fly = :block_fly ,allow_damage = :allow_damage 
-,[restrict_pushing] = @restrict_pushing ,[allow_land_resell] = @allow_land_resell ,[allow_land_join_divide] = @allow_land_join_divide 
+,restrict_pushing = :restrict_pushing ,allow_land_resell = :allow_land_resell ,allow_land_join_divide = :allow_land_join_divide 
-,[block_show_in_search] = @block_show_in_search ,[agent_limit] = @agent_limit ,[object_bonus] = @object_bonus ,[maturity] = @maturity 
+,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity 
-,[disable_scripts] = @disable_scripts ,[disable_collisions] = @disable_collisions ,[disable_physics] = @disable_physics 
+,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics 
-,[terrain_texture_1] = @terrain_texture_1 ,[terrain_texture_2] = @terrain_texture_2 ,[terrain_texture_3] = @terrain_texture_3 
+,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3 
-,[terrain_texture_4] = @terrain_texture_4 ,[elevation_1_nw] = @elevation_1_nw ,[elevation_2_nw] = @elevation_2_nw 
+,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw 
-,[elevation_1_ne] = @elevation_1_ne ,[elevation_2_ne] = @elevation_2_ne ,[elevation_1_se] = @elevation_1_se ,[elevation_2_se] = @elevation_2_se 
+,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se 
-,[elevation_1_sw] = @elevation_1_sw ,[elevation_2_sw] = @elevation_2_sw ,[water_height] = @water_height ,[terrain_raise_limit] = @terrain_raise_limit 
+,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit 
-,[terrain_lower_limit] = @terrain_lower_limit ,[use_estate_sun] = @use_estate_sun ,[fixed_sun] = @fixed_sun ,[sun_position] = @sun_position 
+,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position 
-,[covenant] = @covenant ,[covenant_datetime] = @covenant_datetime, [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id, [map_tile_id] = @TerrainImageID, [telehubobject] = @telehubobject, [parcel_tile_id] = @ParcelImageID
+,covenant = :covenant ,covenant_datetime = :covenant_datetime, sunvectorx = :sunvectorx, sunvectory = :sunvectory, sunvectorz = :sunvectorz,  
- WHERE [regionUUID] = @regionUUID";
+""Sandbox"" = :Sandbox, loaded_creation_datetime = :loaded_creation_datetime, loaded_creation_id = :loaded_creation_id, ""map_tile_ID"" = :TerrainImageID, 
+""TelehubObject"" = :telehubobject, ""parcel_tile_ID"" = :ParcelImageID
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+ WHERE ""regionUUID"" = :regionUUID";
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
                    cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
                    conn.Open();
@@ -1342,51 +1369,29 @@ VALUES
        #region Private Methods
        /// <summary>
-        /// Serializes the terrain data for storage in DB.
-        /// </summary>
-        /// <param name="val">terrain data</param>
-        /// <returns></returns>
-        private static Array serializeTerrain(double[,] val)
-        {
-            MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) * sizeof(double));
-            BinaryWriter bw = new BinaryWriter(str);
-            // TODO: COMPATIBILITY - Add byte-order conversions
-            for (int x = 0; x < (int)Constants.RegionSize; x++)
-                for (int y = 0; y < (int)Constants.RegionSize; y++)
-                {
-                    double height = val[x, y];
-                    if (height == 0.0)
-                        height = double.Epsilon;
-                    bw.Write(height);
-                }
-            return str.ToArray();
-        }
-        /// <summary>
        /// Stores new regionsettings.
        /// </summary>
        /// <param name="regionSettings">The region settings.</param>
        private void StoreNewRegionSettings(RegionSettings regionSettings)
        {
-            string sql = @"INSERT INTO [regionsettings]
+            string sql = @"INSERT INTO regionsettings
-                                ([regionUUID],[block_terraform],[block_fly],[allow_damage],[restrict_pushing],[allow_land_resell],[allow_land_join_divide],
+                                (""regionUUID"",block_terraform,block_fly,allow_damage,restrict_pushing,allow_land_resell,allow_land_join_divide,
-                                [block_show_in_search],[agent_limit],[object_bonus],[maturity],[disable_scripts],[disable_collisions],[disable_physics],
+                                block_show_in_search,agent_limit,object_bonus,maturity,disable_scripts,disable_collisions,disable_physics,
-                                [terrain_texture_1],[terrain_texture_2],[terrain_texture_3],[terrain_texture_4],[elevation_1_nw],[elevation_2_nw],[elevation_1_ne],
+                                terrain_texture_1,terrain_texture_2,terrain_texture_3,terrain_texture_4,elevation_1_nw,elevation_2_nw,elevation_1_ne,
-                                [elevation_2_ne],[elevation_1_se],[elevation_2_se],[elevation_1_sw],[elevation_2_sw],[water_height],[terrain_raise_limit],
+                                elevation_2_ne,elevation_1_se,elevation_2_se,elevation_1_sw,elevation_2_sw,water_height,terrain_raise_limit,
-                                [terrain_lower_limit],[use_estate_sun],[fixed_sun],[sun_position],[covenant],[covenant_datetime],[sunvectorx], [sunvectory], [sunvectorz],[Sandbox], [loaded_creation_datetime], [loaded_creation_id]
+                                terrain_lower_limit,use_estate_sun,fixed_sun,sun_position,covenant,covenant_datetime,sunvectorx, sunvectory, sunvectorz,
- ) 
+                                ""Sandbox"", loaded_creation_datetime, loaded_creation_id
+                                ) 
                            VALUES
-                                (@regionUUID,@block_terraform,@block_fly,@allow_damage,@restrict_pushing,@allow_land_resell,@allow_land_join_divide,
+                                (:regionUUID,:block_terraform,:block_fly,:allow_damage,:restrict_pushing,:allow_land_resell,:allow_land_join_divide,
-                                @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics,
+                                :block_show_in_search,:agent_limit,:object_bonus,:maturity,:disable_scripts,:disable_collisions,:disable_physics,
-                                @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne,
+                                :terrain_texture_1,:terrain_texture_2,:terrain_texture_3,:terrain_texture_4,:elevation_1_nw,:elevation_2_nw,:elevation_1_ne,
-                                @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit,
+                                :elevation_2_ne,:elevation_1_se,:elevation_2_se,:elevation_1_sw,:elevation_2_sw,:water_height,:terrain_raise_limit,
-                                @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant, @covenant_datetime, @sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
+                                :terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory, 
+                                :sunvectorz, :Sandbox, :loaded_creation_datetime, :loaded_creation_id )";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
                cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
                conn.Open();
@@ -1578,8 +1583,8 @@ VALUES
            prim.TouchName = (string)primRow["TouchName"];
            // permissions
            prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
-            //prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
+            //prim.creatorID = new UUID((Guid)primRow["creatorID"]);
-            prim.CreatorIdentification = (string)primRow["CreatorID"];
+            prim.CreatorIdentification = (string)primRow["CreatorID"].ToString();
            prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
            prim.GroupID = new UUID((Guid)primRow["GroupID"]);
            prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
@@ -1685,13 +1690,23 @@ VALUES
            prim.CollisionSound = new UUID((Guid)primRow["CollisionSound"]);
            prim.CollisionSoundVolume = Convert.ToSingle(primRow["CollisionSoundVolume"]);
-            if (Convert.ToInt16(primRow["PassTouches"]) != 0)
-                prim.PassTouches = true;
+            prim.PassTouches = (bool)primRow["PassTouches"];
-            prim.LinkNum = Convert.ToInt32(primRow["LinkNumber"]);
            if (!(primRow["MediaURL"] is System.DBNull))
                prim.MediaUrl = (string)primRow["MediaURL"];
+            if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
+                prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
+            else
+                prim.DynAttrs = new DAMap();             
+            prim.PhysicsShapeType = Convert.ToByte(primRow["PhysicsShapeType"]);
+            prim.Density = Convert.ToSingle(primRow["Density"]);
+            prim.GravityModifier = Convert.ToSingle(primRow["GravityModifier"]);
+            prim.Friction = Convert.ToSingle(primRow["Friction"]);
+            prim.Restitution = Convert.ToSingle(primRow["Restitution"]);
            return prim;
        }
@@ -1749,7 +1764,6 @@ VALUES
                baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]);
            }
            return baseShape;
        }
@@ -1773,8 +1787,8 @@ VALUES
            taskItem.Name = (string)inventoryRow["name"];
            taskItem.Description = (string)inventoryRow["description"];
            taskItem.CreationDate = Convert.ToUInt32(inventoryRow["creationDate"]);
-            //taskItem.CreatorID = new UUID((Guid)inventoryRow["creatorID"]);
+            //taskItem.creatorID = new UUID((Guid)inventoryRow["creatorID"]);
-            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"];
+            taskItem.CreatorIdentification = (string)inventoryRow["creatorID"].ToString();
            taskItem.OwnerID = new UUID((Guid)inventoryRow["ownerID"]);
            taskItem.LastOwnerID = new UUID((Guid)inventoryRow["lastOwnerID"]);
            taskItem.GroupID = new UUID((Guid)inventoryRow["groupID"]);
@@ -1798,9 +1812,9 @@ VALUES
        /// </summary>
        /// <param name="taskItem">item in inventory.</param>
        /// <returns></returns>
-        private SqlParameter[] CreatePrimInventoryParameters(TaskInventoryItem taskItem)
+        private NpgsqlParameter[] CreatePrimInventoryParameters(TaskInventoryItem taskItem)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            parameters.Add(_Database.CreateParameter("itemID", taskItem.ItemID));
            parameters.Add(_Database.CreateParameter("primID", taskItem.ParentPartID));
@@ -1831,9 +1845,9 @@ VALUES
        /// </summary>
        /// <param name="settings">regionsettings.</param>
        /// <returns></returns>
-        private SqlParameter[] CreateRegionSettingParameters(RegionSettings settings)
+        private NpgsqlParameter[] CreateRegionSettingParameters(RegionSettings settings)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            parameters.Add(_Database.CreateParameter("regionUUID", settings.RegionUUID));
            parameters.Add(_Database.CreateParameter("block_terraform", settings.BlockTerraform));
@@ -1888,9 +1902,9 @@ VALUES
        /// <param name="land">land parameters.</param>
        /// <param name="regionUUID">region UUID.</param>
        /// <returns></returns>
-        private SqlParameter[] CreateLandParameters(LandData land, UUID regionUUID)
+        private NpgsqlParameter[] CreateLandParameters(LandData land, UUID regionUUID)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            parameters.Add(_Database.CreateParameter("UUID", land.GlobalID));
            parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
@@ -1912,8 +1926,8 @@ VALUES
            parameters.Add(_Database.CreateParameter("SalePrice", land.SalePrice));
            parameters.Add(_Database.CreateParameter("LandStatus", (int)land.Status)); //Enum. libsecondlife.Parcel.ParcelStatus
            parameters.Add(_Database.CreateParameter("LandFlags", land.Flags));
-            parameters.Add(_Database.CreateParameter("LandingType", land.LandingType));
+            parameters.Add(_Database.CreateParameter("LandingType", Convert.ToInt32( land.LandingType) ));
-            parameters.Add(_Database.CreateParameter("MediaAutoScale", land.MediaAutoScale));
+            parameters.Add(_Database.CreateParameter("MediaAutoScale", Convert.ToInt32( land.MediaAutoScale )));
            parameters.Add(_Database.CreateParameter("MediaTextureUUID", land.MediaID));
            parameters.Add(_Database.CreateParameter("MediaURL", land.MediaURL));
            parameters.Add(_Database.CreateParameter("MusicURL", land.MusicURL));
@@ -1938,9 +1952,9 @@ VALUES
        /// <param name="parcelAccessEntry">parcel access entry.</param>
        /// <param name="parcelID">parcel ID.</param>
        /// <returns></returns>
-        private SqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
+        private NpgsqlParameter[] CreateLandAccessParameters(LandAccessEntry parcelAccessEntry, UUID parcelID)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            parameters.Add(_Database.CreateParameter("LandUUID", parcelID));
            parameters.Add(_Database.CreateParameter("AccessUUID", parcelAccessEntry.AgentID));
@@ -1957,9 +1971,9 @@ VALUES
        /// <param name="sceneGroupID">The scenegroup ID.</param>
        /// <param name="regionUUID">The region ID.</param>
        /// <returns></returns>
-        private SqlParameter[] CreatePrimParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
+        private NpgsqlParameter[] CreatePrimParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            parameters.Add(_Database.CreateParameter("UUID", prim.UUID));
            parameters.Add(_Database.CreateParameter("RegionUUID", regionUUID));
@@ -2080,12 +2094,22 @@ VALUES
            parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
            parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
-            if (prim.PassTouches)
+            
-                parameters.Add(_Database.CreateParameter("PassTouches", 1));
+            parameters.Add(_Database.CreateParameter("PassTouches", prim.PassTouches));
-            else
-                parameters.Add(_Database.CreateParameter("PassTouches", 0));
            parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
            parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
+            
+            if (prim.DynAttrs.CountNamespaces > 0)
+                parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
+            else
+                parameters.Add(_Database.CreateParameter("DynAttrs", null));
+            
+            parameters.Add(_Database.CreateParameter("PhysicsShapeType", prim.PhysicsShapeType));
+            parameters.Add(_Database.CreateParameter("Density", (double)prim.Density));
+            parameters.Add(_Database.CreateParameter("GravityModifier", (double)prim.GravityModifier));
+            parameters.Add(_Database.CreateParameter("Friction", (double)prim.Friction));
+            parameters.Add(_Database.CreateParameter("Restitution", (double)prim.Restitution));
            return parameters.ToArray();
        }
@@ -2097,9 +2121,9 @@ VALUES
        /// <param name="sceneGroupID">The scene group ID.</param>
        /// <param name="regionUUID">The region UUID.</param>
        /// <returns></returns>
-        private SqlParameter[] CreatePrimShapeParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
+        private NpgsqlParameter[] CreatePrimShapeParameters(SceneObjectPart prim, UUID sceneGroupID, UUID regionUUID)
        {
-            List<SqlParameter> parameters = new List<SqlParameter>();
+            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
            PrimitiveBaseShape s = prim.Shape;
            parameters.Add(_Database.CreateParameter("UUID", prim.UUID));
@@ -2143,7 +2167,6 @@ VALUES
                parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
            }
            return parameters.ToArray();
        }
@@ -2155,13 +2178,14 @@ VALUES
        {
            rs.ClearSpawnPoints();
-            string sql = "SELECT Yaw, Pitch, Distance FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            string sql = @"SELECT ""Yaw"", ""Pitch"", ""Distance"" FROM spawn_points WHERE ""RegionUUID"" = :RegionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID.ToString()));
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
                conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                {
                    if (reader.Read())
                    {
@@ -2179,24 +2203,24 @@ VALUES
        private void SaveSpawnPoints(RegionSettings rs)
        {
-            string sql = "DELETE FROM spawn_points WHERE RegionUUID = @RegionUUID";
+            string sql = @"DELETE FROM spawn_points WHERE ""RegionUUID"" = :RegionUUID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
            {
-                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
                conn.Open();
                cmd.ExecuteNonQuery();
            }
            foreach (SpawnPoint p in rs.SpawnPoints())
            {
-                sql = "INSERT INTO spawn_points (RegionUUID, Yaw, Pitch, Distance) VALUES (@RegionUUID, @Yaw, @Pitch, @Distance)";
+                sql = @"INSERT INTO spawn_points (""RegionUUID"", ""Yaw"", ""Pitch"", ""Distance"") VALUES (:RegionUUID, :Yaw, :Pitch, :Distance)";
-                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", rs.RegionUUID));
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", rs.RegionUUID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Yaw", p.Yaw));
+                    cmd.Parameters.Add(_Database.CreateParameter("Yaw", p.Yaw));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Pitch", p.Pitch));
+                    cmd.Parameters.Add(_Database.CreateParameter("Pitch", p.Pitch));
-                    cmd.Parameters.Add(_Database.CreateParameter("@Distance", p.Distance));
+                    cmd.Parameters.Add(_Database.CreateParameter("Distance", p.Distance));
                    conn.Open();
                    cmd.ExecuteNonQuery();
                }
diff --git a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
new file mode 100644
index 0000000..0a68b23
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
@@ -0,0 +1,329 @@
+/*
+ * 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;
+using log4net;
+using System.Reflection;
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLUserAccountData : PGSQLGenericTableHandler<UserAccountData>,IUserAccountData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        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) :
+            base(connectionString, realm, "UserAccount")
+        {
+            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, "UserAccount");
+                m.Update();
+            }
+        }
+        */
+        /*
+        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+        {
+            return null;
+        }
+        */
+        /*
+        public override UserAccountData[] Get(string[] fields, string[] keys)
+        {
+            UserAccountData[] retUA = base.Get(fields,keys);
+            if (retUA.Length > 0)
+            {
+                Dictionary<string, string> data = retUA[0].Data;
+                Dictionary<string, string> data2 = new Dictionary<string, string>();
+                foreach (KeyValuePair<string,string> chave in data)
+                {
+                    string s2 = chave.Key;
+                    data2[s2] = chave.Value;
+                    if (!m_FieldTypes.ContainsKey(chave.Key))
+                    {
+                        string tipo = "";
+                        m_FieldTypes.TryGetValue(chave.Key, out tipo);
+                        m_FieldTypes.Add(s2, tipo);
+                    }
+                }
+                foreach (KeyValuePair<string, string> chave in data2)
+                {
+                    if (!retUA[0].Data.ContainsKey(chave.Key))
+                        retUA[0].Data.Add(chave.Key, chave.Value);
+                }
+            }
+            return retUA;
+        }
+        */
+        /*
+        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 ""PrincipalID"" = :principalID", m_Realm);
+            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("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
+                
+                conn.Open();
+                using (NpgsqlDataReader 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)
+                        {
+                            string s2 = s;
+                            if (s2 == "uuid")
+                                continue;
+                            if (s2 == "scopeid")
+                                continue;
+                            ret.Data[s] = result[s].ToString();
+                        }
+                        return ret;
+                    }
+                }
+            }
+            return null;
+        }
+        
+        
+        public override bool Store(UserAccountData data)
+        {
+            if (data.Data.ContainsKey("PrincipalID"))
+                data.Data.Remove("PrincipalID");
+            if (data.Data.ContainsKey("ScopeID"))
+                data.Data.Remove("ScopeID");
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                m_log.DebugFormat("[USER]: Try to update user {0} {1}", data.FirstName, data.LastName);
+                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;
+                    if (m_FieldTypes.ContainsKey(field))
+                        cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field], m_FieldTypes[field]));
+                    else
+                        cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
+                }
+                updateBuilder.Append(" where \"PrincipalID\" = :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));
+                m_log.DebugFormat("[USER]: SQL update user {0} ", cmd.CommandText);
+                conn.Open();
+                m_log.DebugFormat("[USER]: CON opened update user {0} ", cmd.CommandText);
+                int conta = 0;
+                try
+                {
+                    conta = cmd.ExecuteNonQuery();
+                }
+                catch (Exception e){
+                    m_log.ErrorFormat("[USER]: ERROR opened update user {0} ", e.Message);
+                }
+                
+                if (conta < 1)
+                {
+                    m_log.DebugFormat("[USER]: Try to insert user {0} {1}", data.FirstName, data.LastName);
+                    StringBuilder insertBuilder = new StringBuilder();
+                    insertBuilder.AppendFormat(@"insert into {0} (""PrincipalID"", ""ScopeID"", ""FirstName"", ""LastName"", """, m_Realm);
+                    insertBuilder.Append(String.Join(@""", """, fields));
+                    insertBuilder.Append(@""") values (:principalID, :scopeID, :FirstName, :LastName, :");
+                    insertBuilder.Append(String.Join(", :", fields));
+                    insertBuilder.Append(");");
+                    cmd.Parameters.Add(m_database.CreateParameter("FirstName", data.FirstName));
+                    cmd.Parameters.Add(m_database.CreateParameter("LastName", data.LastName));
+                    cmd.CommandText = insertBuilder.ToString();
+                    if (cmd.ExecuteNonQuery() < 1)
+                    {
+                        return false;
+                    }
+                }
+                else
+                    m_log.DebugFormat("[USER]: User {0} {1} exists", data.FirstName, data.LastName);
+            }
+            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 (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+            {
+                if (m_FieldTypes.ContainsKey(item))
+                    cmd.Parameters.Add(m_database.CreateParameter("" + item, value, m_FieldTypes[item]));
+                else
+                    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 = "";
+            UUID scope_id;
+            UUID.TryParse(scopeID.ToString(), out scope_id); 
+            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""=:UUIDZero) and (""FirstName"" ilike :search or ""LastName"" ilike :search)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("scopeID", (UUID)scope_id));
+                    cmd.Parameters.Add (m_database.CreateParameter("UUIDZero", (UUID)UUID.Zero));
+                    cmd.Parameters.Add(m_database.CreateParameter("search", "%" + words[0] + "%"));
+                }
+                else
+                {
+                    sql = String.Format(@"select * from {0} where (""ScopeID""=:ScopeID or ""ScopeID""=:UUIDZero) and (""FirstName"" ilike :searchFirst or ""LastName"" ilike :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("UUIDZero", (UUID)UUID.Zero));
+                    cmd.Parameters.Add(m_database.CreateParameter("ScopeID", (UUID)scope_id));
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = sql;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
new file mode 100644
index 0000000..f166976
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -0,0 +1,1064 @@
+/*
+ * 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 OpenSim.Data;
+using OpenSim.Framework;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+using Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    public class UserProfilesData : IProfilesData
+    {
+        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected PGSQLManager m_database;
+        #region Properites
+        string ConnectionString
+        {
+            get;
+            set;
+        }
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        #endregion Properties
+        #region class Member Functions
+        public UserProfilesData(string connectionString)
+        {
+            ConnectionString = connectionString;
+            Init();
+        }
+        void Init()
+        {
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+            {
+                dbcon.Open();
+                Migration m = new Migration(dbcon, Assembly, "UserProfiles");
+                m.Update();
+                m_database = new PGSQLManager(ConnectionString);
+            }
+        }
+        #endregion Member Functions
+        #region Classifieds Queries
+        /// <summary>
+        /// Gets the classified records.
+        /// </summary>
+        /// <returns>
+        /// Array of classified records
+        /// </returns>
+        /// <param name='creatorId'>
+        /// Creator identifier.
+        /// </param>
+        public OSDArray GetClassifiedRecords(UUID creatorId)
+        {
+            OSDArray data = new OSDArray();
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+            {
+                string query = @"SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = :Id";
+                dbcon.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                {
+                    cmd.Parameters.Add(m_database.CreateParameter("Id", creatorId));
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                    {
+                        if (reader.HasRows)
+                        {
+                            while (reader.Read())
+                            {
+                                OSDMap n = new OSDMap();
+                                UUID Id = UUID.Zero;
+                                string Name = null;
+                                try
+                                {
+                                    Id = DBGuid.FromDB(reader["classifieduuid"]);
+                                    Name = Convert.ToString(reader["name"]);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.Error("[PROFILES_DATA]: UserAccount exception ", e);
+                                }
+                                n.Add("classifieduuid", OSD.FromUUID(Id));
+                                n.Add("name", OSD.FromString(Name));
+                                data.Add(n);
+                            }
+                        }
+                    }
+                }
+            }
+            return data;
+        }
+        public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
+        {
+            string query = string.Empty;
+            query = @"WITH upsert AS (
+                        UPDATE classifieds SET
+                            classifieduuid = :ClassifiedId, creatoruuid = :CreatorId, creationdate = :CreatedDate,
+                            expirationdate = :ExpirationDate,category =:Category, name = :Name, description = :Description,
+                            parceluuid = :ParcelId, parentestate = :ParentEstate, snapshotuuid = :SnapshotId,
+                            simname = :SimName, posglobal = :GlobalPos, parcelname = :ParcelName, classifiedflags = :Flags,
+                            priceforlisting = :ListingPrice
+                        RETURNING * )
+                      INSERT INTO classifieds (classifieduuid,creatoruuid,creationdate,expirationdate,category,name,
+                            description,parceluuid,parentestate,snapshotuuid,simname,posglobal,parcelname,classifiedflags,
+                            priceforlisting)
+                      SELECT
+                            :ClassifiedId,:CreatorId,:CreatedDate,:ExpirationDate,:Category,:Name,:Description,
+                            :ParcelId,:ParentEstate,:SnapshotId,:SimName,:GlobalPos,:ParcelName,:Flags,:ListingPrice
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
+            if (string.IsNullOrEmpty(ad.ParcelName))
+                ad.ParcelName = "Unknown";
+            if (ad.ParcelId == null)
+                ad.ParcelId = UUID.Zero;
+            if (string.IsNullOrEmpty(ad.Description))
+                ad.Description = "No Description";
+            DateTime epoch = new DateTime(1970, 1, 1);
+            DateTime now = DateTime.Now;
+            TimeSpan epochnow = now - epoch;
+            TimeSpan duration;
+            DateTime expiration;
+            TimeSpan epochexp;
+            if (ad.Flags == 2)
+            {
+                duration = new TimeSpan(7, 0, 0, 0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            else
+            {
+                duration = new TimeSpan(365, 0, 0, 0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            ad.CreationDate = (int)epochnow.TotalSeconds;
+            ad.ExpirationDate = (int)epochexp.TotalSeconds;
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", ad.ClassifiedId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", ad.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatedDate", (int)ad.CreationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("ExpirationDate", (int)ad.ExpirationDate));
+                        cmd.Parameters.Add(m_database.CreateParameter("Category", ad.Category.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", ad.Name.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Description", ad.Description.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", ad.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParentEstate", (int)ad.ParentEstate));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", ad.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName", ad.SimName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", ad.GlobalPos.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelName", ad.ParcelName.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Flags", (int)Convert.ToInt32(ad.Flags)));
+                        cmd.Parameters.Add(m_database.CreateParameter("ListingPrice", (int)Convert.ToInt32(ad.Price)));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: ClassifiedsUpdate exception ", e);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool DeleteClassifiedRecord(UUID recordId)
+        {
+            string query = string.Empty;
+            query = @"DELETE FROM classifieds WHERE classifieduuid = :ClassifiedId ;";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: DeleteClassifiedRecord exception ", e);
+                return false;
+            }
+            return true;
+        }
+        public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
+        {
+            string query = string.Empty;
+            query += "SELECT * FROM classifieds WHERE ";
+            query += "classifieduuid = :AdId";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("AdId", ad.ClassifiedId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if (reader.Read())
+                            {
+                                ad.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                ad.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                ad.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
+                                ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
+                                ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
+                                ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
+                                ad.Flags = (byte)Convert.ToInt16(reader["classifiedflags"]);
+                                ad.Category = Convert.ToInt32(reader["category"]);
+                                ad.Price = Convert.ToInt16(reader["priceforlisting"]);
+                                ad.Name = reader["name"].ToString();
+                                ad.Description = reader["description"].ToString();
+                                ad.SimName = reader["simname"].ToString();
+                                ad.GlobalPos = reader["posglobal"].ToString();
+                                ad.ParcelName = reader["parcelname"].ToString();
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetClassifiedInfo exception ", e);
+            }
+            return true;
+        }
+        public static UUID GetUUID(object uuidValue)
+        {
+            UUID ret = UUID.Zero;
+            UUID.TryParse(uuidValue.ToString(), out ret);
+            return ret;
+        }
+        #endregion Classifieds Queries
+        #region Picks Queries
+        public OSDArray GetAvatarPicks(UUID avatarId)
+        {
+            string query = string.Empty;
+            query += "SELECT pickuuid, name FROM userpicks WHERE ";
+            query += "creatoruuid = :Id";
+            OSDArray data = new OSDArray();
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if (reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    OSDMap record = new OSDMap();
+                                    record.Add("pickuuid", OSD.FromUUID(DBGuid.FromDB(reader["pickuuid"])));
+                                    record.Add("name", OSD.FromString((string)reader["name"]));
+                                    data.Add(record);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetAvatarPicks exception ", e);
+            }
+            return data;
+        }
+        public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
+        {
+            string query = string.Empty;
+            UserProfilePick pick = new UserProfilePick();
+            query += "SELECT * FROM userpicks WHERE ";
+            query += "creatoruuid = :CreatorId AND ";
+            query += "pickuuid =  :PickId";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", avatarId));
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if (reader.HasRows)
+                            {
+                                reader.Read();
+                                string description = (string)reader["description"];
+                                if (string.IsNullOrEmpty(description))
+                                    description = "No description given.";
+                                pick.PickId = DBGuid.FromDB(reader["pickuuid"]);
+                                pick.CreatorId = DBGuid.FromDB(reader["creatoruuid"]);
+                                pick.ParcelId = DBGuid.FromDB(reader["parceluuid"]);
+                                pick.SnapshotId = DBGuid.FromDB(reader["snapshotuuid"]);
+                                pick.GlobalPos = (string)reader["posglobal"].ToString();
+                                pick.TopPick = Convert.ToBoolean(reader["toppick"]);
+                                pick.Enabled = Convert.ToBoolean(reader["enabled"]);
+                                pick.Name = reader["name"].ToString();
+                                pick.Desc = reader["description"].ToString();
+                                pick.ParcelName = reader["user"].ToString();
+                                pick.OriginalName = reader["originalname"].ToString();
+                                pick.SimName = reader["simname"].ToString();
+                                pick.SortOrder = (int)reader["sortorder"];
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetPickInfo exception ", e);
+            }
+            return pick;
+        }
+        public bool UpdatePicksRecord(UserProfilePick pick)
+        {
+            string query = string.Empty;
+            query = @"WITH upsert AS (
+                        UPDATE userpicks SET
+                            pickuuid = :PickId, creatoruuid = :CreatorId, toppick = :TopPick, parceluuid = :ParcelId,
+                            name = :Name, description = :Desc, snapshotuuid = :SnapshotId, ""user"" = :User, 
+                            originalname = :Original, simname = :SimName, posglobal = :GlobalPos, 
+                            sortorder = :SortOrder, enabled = :Enabled 
+                        RETURNING * ) 
+                      INSERT INTO userpicks (pickuuid,creatoruuid,toppick,parceluuid,name,description,
+                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled) 
+                      SELECT
+                            :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User,
+                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled 
+                      WHERE NOT EXISTS (
+                        SELECT * FROM upsert )";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pick.PickId));
+                        cmd.Parameters.Add(m_database.CreateParameter("CreatorId", pick.CreatorId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TopPick", pick.TopPick));
+                        cmd.Parameters.Add(m_database.CreateParameter("ParcelId", pick.ParcelId));
+                        cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name));
+                        cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc));
+                        cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId));
+                        cmd.Parameters.Add(m_database.CreateParameter("User", pick.ParcelName));
+                        cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName));
+                        cmd.Parameters.Add(m_database.CreateParameter("SimName", pick.SimName));
+                        cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos));
+                        cmd.Parameters.Add(m_database.CreateParameter("SortOrder", pick.SortOrder));
+                        cmd.Parameters.Add(m_database.CreateParameter("Enabled", pick.Enabled));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
+                return false;
+            }
+            return true;
+        }
+        public bool DeletePicksRecord(UUID pickId)
+        {
+            string query = string.Empty;
+            query += "DELETE FROM userpicks WHERE ";
+            query += "pickuuid = :PickId";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("PickId", pickId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: DeleteUserPickRecord exception ", e);
+                return false;
+            }
+            return true;
+        }
+        #endregion Picks Queries
+        #region Avatar Notes Queries
+        public bool GetAvatarNotes(ref UserProfileNotes notes)
+        {  // WIP
+            string query = string.Empty;
+            query += "SELECT notes FROM usernotes WHERE ";
+            query += "useruuid = :Id AND ";
+            query += "targetuuid = :TargetId";
+            OSDArray data = new OSDArray();
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", notes.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", notes.TargetId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                reader.Read();
+                                notes.Notes = OSD.FromString((string)reader["notes"]);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
+            }
+            return true;
+        }
+        public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
+        {
+            string query = string.Empty;
+            bool remove;
+            if (string.IsNullOrEmpty(note.Notes))
+            {
+                remove = true;
+                query += "DELETE FROM usernotes WHERE ";
+                query += "useruuid=:UserId AND ";
+                query += "targetuuid=:TargetId";
+            }
+            else
+            {
+                remove = false;
+                query = @"WITH upsert AS (
+                          UPDATE usernotes SET notes = :Notes, useruuid = :UserId, targetuuid = :TargetId RETURNING * )
+                          INSERT INTO usernotes (notes,useruuid,targetuuid)
+                          SELECT :Notes,:UserId,:TargetId
+                            WHERE NOT EXISTS (
+                              SELECT * FROM upsert
+                            )";
+            }
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        if (!remove)
+                            cmd.Parameters.Add(m_database.CreateParameter("Notes", note.Notes));
+                        cmd.Parameters.Add(m_database.CreateParameter("TargetId", note.TargetId));
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", note.UserId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarNotes exception ", e);
+                return false;
+            }
+            return true;
+        }
+        #endregion Avatar Notes Queries
+        #region Avatar Properties
+        public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
+        {
+            string query = string.Empty;
+            query += "SELECT * FROM userprofile WHERE ";
+            query += "useruuid = :Id";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                // m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                  ": Getting data for {0}.", props.UserId);
+                                reader.Read();
+                                props.WebUrl = (string)reader["profileURL"].ToString();
+                                props.ImageId = DBGuid.FromDB(reader["profileImage"]);
+                                props.AboutText = (string)reader["profileAboutText"];
+                                props.FirstLifeImageId = DBGuid.FromDB(reader["profileFirstImage"]);
+                                props.FirstLifeText = (string)reader["profileFirstText"];
+                                props.PartnerId = DBGuid.FromDB(reader["profilePartner"]);
+                                props.WantToMask = (int)reader["profileWantToMask"];
+                                props.WantToText = (string)reader["profileWantToText"];
+                                props.SkillsMask = (int)reader["profileSkillsMask"];
+                                props.SkillsText = (string)reader["profileSkillsText"];
+                                props.Language = (string)reader["profileLanguages"];
+                            }
+                            else
+                            {
+                                //m_log.DebugFormat("[PROFILES_DATA]" +
+                                //                 ": No data for {0}", props.UserId);
+                                props.WebUrl = string.Empty;
+                                props.ImageId = UUID.Zero;
+                                props.AboutText = string.Empty;
+                                props.FirstLifeImageId = UUID.Zero;
+                                props.FirstLifeText = string.Empty;
+                                props.PartnerId = UUID.Zero;
+                                props.WantToMask = 0;
+                                props.WantToText = string.Empty;
+                                props.SkillsMask = 0;
+                                props.SkillsText = string.Empty;
+                                props.Language = string.Empty;
+                                props.PublishProfile = false;
+                                props.PublishMature = false;
+                                query = "INSERT INTO userprofile (";
+                                query += "useruuid, ";
+                                query += "\"profilePartner\", ";
+                                query += "\"profileAllowPublish\", ";
+                                query += "\"profileMaturePublish\", ";
+                                query += "\"profileURL\", ";
+                                query += "\"profileWantToMask\", ";
+                                query += "\"profileWantToText\", ";
+                                query += "\"profileSkillsMask\", ";
+                                query += "\"profileSkillsText\", ";
+                                query += "\"profileLanguages\", ";
+                                query += "\"profileImage\", ";
+                                query += "\"profileAboutText\", ";
+                                query += "\"profileFirstImage\", ";
+                                query += "\"profileFirstText\") VALUES (";
+                                query += ":userId, ";
+                                query += ":profilePartner, ";
+                                query += ":profileAllowPublish, ";
+                                query += ":profileMaturePublish, ";
+                                query += ":profileURL, ";
+                                query += ":profileWantToMask, ";
+                                query += ":profileWantToText, ";
+                                query += ":profileSkillsMask, ";
+                                query += ":profileSkillsText, ";
+                                query += ":profileLanguages, ";
+                                query += ":profileImage, ";
+                                query += ":profileAboutText, ";
+                                query += ":profileFirstImage, ";
+                                query += ":profileFirstText)";
+                                dbcon.Close();
+                                dbcon.Open();
+                                using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
+                                {
+                                    //m_log.DebugFormat("[PROFILES_DATA]" +
+                                    //                  ": Adding new data for {0}", props.UserId);
+                                    put.Parameters.Add(m_database.CreateParameter("userId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("profilePartner", props.PartnerId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAllowPublish", props.PublishProfile));
+                                    put.Parameters.Add(m_database.CreateParameter("profileMaturePublish", props.PublishMature));
+                                    put.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToMask", props.WantToMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileWantToText", props.WantToText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsMask", props.SkillsMask));
+                                    put.Parameters.Add(m_database.CreateParameter("profileSkillsText", props.SkillsText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileLanguages", props.Language));
+                                    put.Parameters.Add(m_database.CreateParameter("profileImage", props.ImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileAboutText", props.AboutText));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstImage", props.FirstLifeImageId));
+                                    put.Parameters.Add(m_database.CreateParameter("profileFirstText", props.FirstLifeText));
+                                    put.ExecuteNonQuery();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetAvatarProperties exception ", e);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
+        {
+            string query = string.Empty;
+            query += "UPDATE userprofile SET ";
+            query += "\"profileURL\"=:profileURL, ";
+            query += "\"profileImage\"=:image, ";
+            query += "\"profileAboutText\"=:abouttext,";
+            query += "\"profileFirstImage\"=:firstlifeimage,";
+            query += "\"profileFirstText\"=:firstlifetext ";
+            query += "WHERE \"useruuid\"=:uuid";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("profileURL", props.WebUrl));
+                        cmd.Parameters.Add(m_database.CreateParameter("image", props.ImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("abouttext", props.AboutText));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifeimage", props.FirstLifeImageId));
+                        cmd.Parameters.Add(m_database.CreateParameter("firstlifetext", props.FirstLifeText));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", props.UserId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: AgentPropertiesUpdate exception ", e);
+                return false;
+            }
+            return true;
+        }
+        #endregion Avatar Properties
+        #region Avatar Interests
+        public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
+        {
+            string query = string.Empty;
+            query += "UPDATE userprofile SET ";
+            query += "\"profileWantToMask\"=:WantMask, ";
+            query += "\"profileWantToText\"=:WantText,";
+            query += "\"profileSkillsMask\"=:SkillsMask,";
+            query += "\"profileSkillsText\"=:SkillsText, ";
+            query += "\"profileLanguages\"=:Languages ";
+            query += "WHERE \"useruuid\"=:uuid";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("WantMask", up.WantToMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("WantText", up.WantToText));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsMask", up.SkillsMask));
+                        cmd.Parameters.Add(m_database.CreateParameter("SkillsText", up.SkillsText));
+                        cmd.Parameters.Add(m_database.CreateParameter("Languages", up.Language));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", up.UserId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: UpdateAvatarInterests exception ", e);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        #endregion Avatar Interests
+        public OSDArray GetUserImageAssets(UUID avatarId)
+        {
+            OSDArray data = new OSDArray();
+            string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"classifieds\""), dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
+                                }
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"userpicks\""), dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
+                                }
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                    dbcon.Open();
+                    query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id";
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format(query, "\"userpicks\""), dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
+            }
+            return data;
+        }
+        #region User Preferences
+        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
+        {
+            string query = string.Empty;
+            query += "SELECT imviaemail::VARCHAR,visible::VARCHAR,email FROM ";
+            query += "usersettings WHERE ";
+            query += "useruuid = :Id";
+            OSDArray data = new OSDArray();
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if (reader.HasRows)
+                            {
+                                reader.Read();
+                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
+                                bool.TryParse((string)reader["visible"], out pref.Visible);
+                                pref.EMail = (string)reader["email"];
+                            }
+                            else
+                            {
+                                using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
+                                {
+                                    put.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
+                                    query = "INSERT INTO usersettings VALUES ";
+                                    query += "(:Id,'false','false', '')";
+                                    put.ExecuteNonQuery();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetUserPreferences exception ", e);
+                result = e.Message;
+            }
+            return true;
+        }
+        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
+        {
+            string query = string.Empty;
+            query += "UPDATE usersettings SET ";
+            query += "imviaemail=:ImViaEmail, ";
+            query += "visible=:Visible, ";
+            query += "email=:Email ";
+            query += "WHERE useruuid=:uuid";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail));
+                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible));
+                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower()));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: UpdateUserPreferences exception ", e);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        #endregion User Preferences
+        #region Integration
+        public bool GetUserAppData(ref UserAppData props, ref string result)
+        {
+            string query = string.Empty;
+            query += "SELECT * FROM userdata WHERE ";
+            query += "\"UserId\" = :Id AND ";
+            query += "\"TagId\" = :TagId";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
+                        using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if (reader.HasRows)
+                            {
+                                reader.Read();
+                                props.DataKey = (string)reader["DataKey"];
+                                props.DataVal = (string)reader["DataVal"];
+                            }
+                            else
+                            {
+                                query += "INSERT INTO userdata VALUES ( ";
+                                query += ":UserId,";
+                                query += ":TagId,";
+                                query += ":DataKey,";
+                                query += ":DataVal) ";
+                                using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
+                                {
+                                    put.Parameters.Add(m_database.CreateParameter("UserId", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
+                                    put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
+                                    put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
+                                    put.ExecuteNonQuery();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: GetUserAppData exception ", e);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool SetUserAppData(UserAppData props, ref string result)
+        {
+            string query = string.Empty;
+            query += "UPDATE userdata SET ";
+            query += "\"TagId\" = :TagId, ";
+            query += "\"DataKey\" = :DataKey, ";
+            query += "\"DataVal\" = :DataVal WHERE ";
+            query += "\"UserId\" = :UserId AND ";
+            query += "\"TagId\" = :TagId";
+            try
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("UserId", props.UserId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString()));
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[PROFILES_DATA]: SetUserData exception ", e);
+                return false;
+            }
+            return true;
+        }
+        #endregion Integration
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
new file mode 100644
index 0000000..4f682f0
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -0,0 +1,587 @@
+/*
+ * 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.IO.Compression;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+using Npgsql;
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLXAssetData : IXAssetDataPlugin
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        /// <summary>
+        /// Number of days that must pass before we update the access time on an asset when it has been fetched.
+        /// </summary>
+        private const int DaysBetweenAccessTimeUpdates = 30;
+        private bool m_enableCompression = false;
+        private PGSQLManager m_database;
+        private string m_connectionString;
+        private object m_dbLock = new object();
+        /// <summary>
+        /// We can reuse this for all hashing since all methods are single-threaded through m_dbBLock
+        /// </summary>
+        private HashAlgorithm hasher = new SHA256CryptoServiceProvider();
+        #region IPlugin Members
+        public string Version { get { return "1.0.0.0"; } }
+        /// <summary>
+        /// <para>Initialises Asset interface</para>
+        /// <para>
+        /// <list type="bullet">
+        /// <item>Loads and initialises the PGSQL storage plugin.</item>
+        /// <item>Warns and uses the obsolete pgsql_connection.ini if connect string is empty.</item>
+        /// <item>Check for migration</item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        /// <param name="connect">connect string</param>
+        public void Initialise(string connect)
+        {
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: THIS PLUGIN IS STRICTLY EXPERIMENTAL.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: DO NOT USE FOR ANY DATA THAT YOU DO NOT MIND LOSING.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: DATABASE TABLES CAN CHANGE AT ANY TIME, CAUSING EXISTING DATA TO BE LOST.");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_log.ErrorFormat("[PGSQL XASSETDATA]: ***********************************************************");
+            m_connectionString = connect;
+            m_database = new PGSQLManager(m_connectionString);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+                Migration m = new Migration(dbcon, Assembly, "XAssetStore");
+                m.Update();
+            }
+        }
+        public void Initialise()
+        {
+            throw new NotImplementedException();
+        }
+        public void Dispose() { }
+        /// <summary>
+        /// The name of this DB provider
+        /// </summary>
+        public string Name
+        {
+            get { return "PGSQL XAsset storage engine"; }
+        }
+        #endregion
+        #region IAssetDataPlugin Members
+        /// <summary>
+        /// Fetch Asset <paramref name="assetID"/> from database
+        /// </summary>
+        /// <param name="assetID">Asset UUID to fetch</param>
+        /// <returns>Return the asset</returns>
+        /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
+        public AssetBase GetAsset(UUID assetID)
+        {
+//            m_log.DebugFormat("[PGSQL XASSET DATA]: Looking for asset {0}", assetID);
+            AssetBase asset = null;
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(
+                        @"SELECT name, description, access_time, ""AssetType"", local, temporary, asset_flags, creatorid, data
+                            FROM XAssetsMeta 
+                            JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
+                        dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("ID", assetID));
+                        try
+                        {
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            {
+                                if (dbReader.Read())
+                                {
+                                    asset = new AssetBase(
+                                        assetID,
+                                        (string)dbReader["name"],
+                                        Convert.ToSByte(dbReader["AssetType"]),
+                                        dbReader["creatorid"].ToString());
+                                    asset.Data = (byte[])dbReader["data"];
+                                    asset.Description = (string)dbReader["description"];
+                                    string local = dbReader["local"].ToString();
+                                    if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
+                                        asset.Local = true;
+                                    else
+                                        asset.Local = false;
+                                    asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                    asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                    if (m_enableCompression)
+                                    {
+                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
+                                        {
+                                            MemoryStream outputStream = new MemoryStream();
+                                            WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
+    //                                        int compressedLength = asset.Data.Length;
+                                            asset.Data = outputStream.ToArray();
+    
+    //                                        m_log.DebugFormat(
+    //                                            "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
+    //                                            asset.ID, asset.Name, asset.Data.Length, compressedLength);
+                                        }
+                                    }
+                                    UpdateAccessTime(asset.Metadata, (int)dbReader["access_time"]);
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(string.Format("[PGSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
+                        }
+                    }
+                }
+            }
+            return asset;
+        }
+        /// <summary>
+        /// Create an asset in database, or update it if existing.
+        /// </summary>
+        /// <param name="asset">Asset UUID to create</param>
+        /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
+        public void StoreAsset(AssetBase asset)
+        {
+//            m_log.DebugFormat("[XASSETS DB]: Storing asset {0} {1}", asset.Name, asset.ID);
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlTransaction transaction = dbcon.BeginTransaction())
+                    {
+                        string assetName = asset.Name;
+                        if (asset.Name.Length > 64)
+                        {
+                            assetName = asset.Name.Substring(0, 64);
+                            m_log.WarnFormat(
+                                "[XASSET 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(
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+                        }
+                        if (m_enableCompression)
+                        {
+                            MemoryStream outputStream = new MemoryStream();
+                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress, false))
+                            {
+    //                            Console.WriteLine(WebUtil.CopyTo(new MemoryStream(asset.Data), compressionStream, int.MaxValue));
+                                // We have to close the compression stream in order to make sure it writes everything out to the underlying memory output stream.
+                                compressionStream.Close();
+                                byte[] compressedData = outputStream.ToArray();
+                                asset.Data = compressedData;
+                            }
+                        }
+                        byte[] hash = hasher.ComputeHash(asset.Data);
+                        UUID asset_id;
+                        UUID.TryParse(asset.ID, out asset_id);
+//                        m_log.DebugFormat(
+//                            "[XASSET DB]: Compressed data size for {0} {1}, hash {2} is {3}",
+//                            asset.ID, asset.Name, hash, compressedData.Length);
+                        try
+                        {
+                            using (NpgsqlCommand cmd =
+                                new NpgsqlCommand(
+                                    @"insert INTO XAssetsMeta(id, hash, name, description, ""AssetType"", local, temporary, create_time, access_time, asset_flags, creatorid)
+                                       Select :ID, :Hash, :Name, :Description, :AssetType, :Local, :Temporary, :CreateTime, :AccessTime, :AssetFlags, :CreatorID
+                                        where not exists( Select id from XAssetsMeta where id = :ID);
+                                      update XAssetsMeta
+                                          set id = :ID, hash = :Hash, name = :Name, description = :Description, 
+                                              ""AssetType"" = :AssetType, local = :Local, temporary = :Temporary, create_time = :CreateTime, 
+                                              access_time = :AccessTime, asset_flags = :AssetFlags, creatorid = :CreatorID
+                                        where id = :ID;
+                                     ",
+                                    dbcon))
+                            {
+                                // create unix epoch time
+                                int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                                cmd.Parameters.Add(m_database.CreateParameter("ID", asset_id));
+                                cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
+                                cmd.Parameters.Add(m_database.CreateParameter("Name", assetName));
+                                cmd.Parameters.Add(m_database.CreateParameter("Description", assetDescription));
+                                cmd.Parameters.Add(m_database.CreateParameter("AssetType", asset.Type));
+                                cmd.Parameters.Add(m_database.CreateParameter("Local", asset.Local));
+                                cmd.Parameters.Add(m_database.CreateParameter("Temporary", asset.Temporary));
+                                cmd.Parameters.Add(m_database.CreateParameter("CreateTime", now));
+                                cmd.Parameters.Add(m_database.CreateParameter("AccessTime", now));
+                                cmd.Parameters.Add(m_database.CreateParameter("CreatorID", asset.Metadata.CreatorID));
+                                cmd.Parameters.Add(m_database.CreateParameter("AssetFlags", (int)asset.Flags));
+                                cmd.ExecuteNonQuery();
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.ErrorFormat("[ASSET DB]: PGSQL failure creating asset metadata {0} with name \"{1}\". Error: {2}",
+                                asset.FullID, asset.Name, e.Message);
+                            transaction.Rollback();
+                            return;
+                        }
+                        if (!ExistsData(dbcon, transaction, hash))
+                        {
+                            try
+                            {
+                                using (NpgsqlCommand cmd =
+                                    new NpgsqlCommand(
+                                        @"INSERT INTO XAssetsData(hash, data) VALUES(:Hash, :Data)",
+                                        dbcon))
+                                {
+                                    cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
+                                    cmd.Parameters.Add(m_database.CreateParameter("Data", asset.Data));
+                                    cmd.ExecuteNonQuery();
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("[XASSET DB]: PGSQL failure creating asset data {0} with name \"{1}\". Error: {2}",
+                                    asset.FullID, asset.Name, e.Message);
+    
+                                transaction.Rollback();
+    
+                                return;
+                            }
+                        }
+    
+                        transaction.Commit();
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Updates the access time of the asset if it was accessed above a given threshhold amount of time.
+        /// </summary>
+        /// <remarks>
+        /// This gives us some insight into assets which haven't ben accessed for a long period.  This is only done
+        /// over the threshold time to avoid excessive database writes as assets are fetched.
+        /// </remarks>
+        /// <param name='asset'></param>
+        /// <param name='accessTime'></param>
+        private void UpdateAccessTime(AssetMetadata assetMetadata, int accessTime)
+        {
+            DateTime now = DateTime.UtcNow;
+            if ((now - Utils.UnixTimeToDateTime(accessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
+                return;
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    NpgsqlCommand cmd =
+                        new NpgsqlCommand(@"update XAssetsMeta set access_time=:AccessTime where id=:ID", dbcon);
+                    try
+                    {
+                        UUID asset_id;
+                        UUID.TryParse(assetMetadata.ID, out asset_id);
+                        using (cmd)
+                        {
+                            // create unix epoch time
+                            cmd.Parameters.Add(m_database.CreateParameter("id", asset_id));
+                            cmd.Parameters.Add(m_database.CreateParameter("access_time", (int)Utils.DateTimeToUnixTime(now)));
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}", 
+                            assetMetadata.ID, assetMetadata.Name, e.Message);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// We assume we already have the m_dbLock.
+        /// </summary>
+        /// TODO: need to actually use the transaction.
+        /// <param name="dbcon"></param>
+        /// <param name="transaction"></param>
+        /// <param name="hash"></param>
+        /// <returns></returns>
+        private bool ExistsData(NpgsqlConnection dbcon, NpgsqlTransaction transaction, byte[] hash)
+        {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+            bool exists = false;
+            using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT hash FROM XAssetsData WHERE hash=:Hash", dbcon))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("Hash", hash));
+                try
+                {
+                    using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if (dbReader.Read())
+                        {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
+                            exists = true;
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[XASSETS DB]: PGSql failure in ExistsData fetching hash {0}.  Exception {1}{2}",
+                        hash, e.Message, e.StackTrace);
+                }
+            }
+            return exists;
+        }
+        /// <summary>
+        /// Check if the assets exist in the database.
+        /// </summary>
+        /// <param name="uuids">The assets' IDs</param>
+        /// <returns>For each asset: true if it exists, false otherwise</returns>
+        public bool[] AssetsExist(UUID[] uuids)
+        {
+            if (uuids.Length == 0)
+                return new bool[0];
+            HashSet<UUID> exist = new HashSet<UUID>();
+            string ids = "'" + string.Join("','", uuids) + "'";
+            string sql = string.Format(@"SELECT id FROM XAssetsMeta WHERE id IN ({0})", ids);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                conn.Open();
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            UUID id = DBGuid.FromDB(reader["id"]);
+                            exist.Add(id);
+                        }
+                    }
+                }
+            }
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = exist.Contains(uuids[i]);
+            return results;
+        }
+        /// <summary>
+        /// Check if the asset exists in the database
+        /// </summary>
+        /// <param name="uuid">The asset UUID</param>
+        /// <returns>true if it exists, false otherwise.</returns>
+        public bool ExistsAsset(UUID uuid)
+        {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+            bool assetExists = false;
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT id FROM XAssetsMeta WHERE id=:ID", dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter("id", uuid));
+                        try
+                        {
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                            {
+                                if (dbReader.Read())
+                                {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
+                                    assetExists = true;
+                                }
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Error(string.Format("[XASSETS DB]: PGSql failure fetching asset {0}", uuid), e);
+                        }
+                    }
+                }
+            }
+            return assetExists;
+        }
+        /// <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 List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
+        {
+            List<AssetMetadata> retList = new List<AssetMetadata>(count);
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
+                                            FROM XAssetsMeta 
+                                            LIMIT :start, :count", dbcon);
+                    cmd.Parameters.Add(m_database.CreateParameter("start", start));
+                    cmd.Parameters.Add(m_database.CreateParameter("count", count));
+                    try
+                    {
+                        using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
+                        {
+                            while (dbReader.Read())
+                            {
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["name"];
+                                metadata.Description = (string)dbReader["description"];
+                                metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
+                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                metadata.CreatorID = dbReader["creatorid"].ToString();
+                                // We'll ignore this for now - it appears unused!
+//                                metadata.SHA1 = dbReader["hash"]);
+                                UpdateAccessTime(metadata, (int)dbReader["access_time"]);
+                                retList.Add(metadata);
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
+                    }
+                }
+            }
+            return retList;
+        }
+        public bool Delete(string id)
+        {
+//            m_log.DebugFormat("[XASSETS DB]: Deleting asset {0}", id);
+            lock (m_dbLock)
+            {
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(@"delete from XAssetsMeta where id=:ID", dbcon))
+                    {
+                        cmd.Parameters.Add(m_database.CreateParameter(id, id));
+                        cmd.ExecuteNonQuery();
+                    }
+                    // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
+                    // keep a reference count (?)
+                }
+            }
+            return true;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index 9164ffe..a22b882 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -31,29 +31,39 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
 using log4net;
+using Npgsql;
+using NpgsqlTypes;
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLXInventoryData : IXInventoryData
+    public class PGSQLXInventoryData : IXInventoryData
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        private MSSQLFolderHandler m_Folders;
+        private PGSQLFolderHandler m_Folders;
-        private MSSQLItemHandler m_Items;
+        private PGSQLItemHandler m_Items;
-        public MSSQLXInventoryData(string conn, string realm)
+        public PGSQLXInventoryData(string conn, string realm)
        {
-            m_Folders = new MSSQLFolderHandler(
+            m_Folders = new PGSQLFolderHandler(
                    conn, "inventoryfolders", "InventoryStore");
-            m_Items = new MSSQLItemHandler(
+            m_Items = new PGSQLItemHandler(
                    conn, "inventoryitems", String.Empty);
        }
+        public static UUID str2UUID(string strUUID)
+        {
+            UUID newUUID = UUID.Zero;
+            UUID.TryParse(strUUID, out newUUID);
+            return newUUID;
+        }
        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
        {
            return m_Folders.Get(fields, vals);
@@ -113,7 +123,7 @@ namespace OpenSim.Data.MSSQL
        public XInventoryItem[] GetActiveGestures(UUID principalID)
        {
-            return m_Items.GetActiveGestures(principalID);
+            return m_Items.GetActiveGestures(principalID.ToString());
        }
        public int GetAssetPermissions(UUID principalID, UUID assetID)
@@ -122,9 +132,9 @@ namespace OpenSim.Data.MSSQL
        }
    }
-    public class MSSQLItemHandler : MSSQLInventoryHandler<XInventoryItem>
+    public class PGSQLItemHandler : PGSQLInventoryHandler<XInventoryItem>
    {
-        public MSSQLItemHandler(string c, string t, string m) :
+        public PGSQLItemHandler(string c, string t, string m) :
            base(c, t, m)
        {
        }
@@ -137,14 +147,13 @@ namespace OpenSim.Data.MSSQL
            UUID oldParent = retrievedItems[0].parentFolderID;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                {
+                    cmd.CommandText = String.Format(@"update {0} set ""parentFolderID"" = :ParentFolderID where ""inventoryID"" = :InventoryID", m_Realm);
-                    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("@ParentFolderID", newParent));
+                    cmd.Parameters.Add(m_database.CreateParameter("InventoryID", id ));
-                    cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
                    cmd.Connection = conn;
                    conn.Open();
@@ -159,16 +168,19 @@ namespace OpenSim.Data.MSSQL
            return true;
        }
-        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        public XInventoryItem[] GetActiveGestures(string principalID)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                {
-                    cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
+                    cmd.CommandText = String.Format(@"select * from inventoryitems where ""avatarID"" = :uuid and ""assetType"" = :type and ""flags"" = 1", m_Realm);
+                    UUID princID = UUID.Zero;
+                    UUID.TryParse(principalID, out princID);
-                    cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
+                    cmd.Parameters.Add(m_database.CreateParameter("uuid", principalID));
-                    cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
+                    cmd.Parameters.Add(m_database.CreateParameter("type", (int)AssetType.Gesture));
                    cmd.Connection = conn;
                    conn.Open();
                    return DoQuery(cmd);
@@ -178,16 +190,21 @@ namespace OpenSim.Data.MSSQL
        public int GetAssetPermissions(UUID principalID, UUID assetID)
        {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
-                using (SqlCommand cmd = new SqlCommand())
+                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.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
-                    cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                                 from inventoryitems 
-                    cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
+                                 where ""avatarID"" = :PrincipalID 
+                                   and ""assetID"" = :AssetID 
+                                 group by ""assetID"" ", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
+                    cmd.Parameters.Add(m_database.CreateParameter("AssetID", assetID));
                    cmd.Connection = conn;
                    conn.Open();
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                    {
                        int perms = 0;
@@ -215,9 +232,9 @@ namespace OpenSim.Data.MSSQL
        }
    }
-    public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
+    public class PGSQLFolderHandler : PGSQLInventoryHandler<XInventoryFolder>
    {
-        public MSSQLFolderHandler(string c, string t, string m) :
+        public PGSQLFolderHandler(string c, string t, string m) :
            base(c, t, m)
        {
        }
@@ -231,14 +248,19 @@ namespace OpenSim.Data.MSSQL
            UUID oldParentFolderUUID = folders[0].parentFolderID;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(id, out foldID);
+                    UUID newPar = UUID.Zero;
+                    UUID.TryParse(newParentFolderID, out newPar);
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where folderID = @folderID", m_Realm);
+                    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("ParentFolderID", newPar));
-                    cmd.Parameters.Add(m_database.CreateParameter("@folderID", id));
+                    cmd.Parameters.Add(m_database.CreateParameter("folderID", foldID));
                    cmd.Connection = conn;
                    conn.Open();
@@ -264,9 +286,9 @@ namespace OpenSim.Data.MSSQL
        }
    }
-    public class MSSQLInventoryHandler<T> : MSSQLGenericTableHandler<T> where T: class, new()
+    public class PGSQLInventoryHandler<T> : PGSQLGenericTableHandler<T> where T: class, new()
    {
-        public MSSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
+        public PGSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
        protected bool IncrementFolderVersion(UUID folderID)
        {
@@ -275,18 +297,21 @@ namespace OpenSim.Data.MSSQL
        protected bool IncrementFolderVersion(string folderID)
        {
-//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            m_log.DebugFormat("[PGSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
-            string sql = "update inventoryfolders set version=version+1 where folderID = ?folderID";
+            string sql = @"update inventoryfolders set version=version+1 where ""folderID"" = :folderID";
-            
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
            {
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(folderID, out foldID);
                    conn.Open();
-                    cmd.Parameters.AddWithValue("@folderID", folderID);
+                    cmd.Parameters.Add( m_database.CreateParameter("folderID", foldID) );
                    try
                    {
@@ -302,4 +327,4 @@ namespace OpenSim.Data.MSSQL
            return true;
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
index 1a67e70..1e88b2c 100644
--- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly : AssemblyTitle("OpenSim.Data.MSSQL")]
+[assembly : AssemblyTitle("OpenSim.Data.PGSQL")]
 [assembly : AssemblyDescription("")]
 [assembly : AssemblyConfiguration("")]
 [assembly : AssemblyCompany("http://opensimulator.org")]
-[assembly : AssemblyProduct("OpenSim.Data.MSSQL")]
+[assembly : AssemblyProduct("OpenSim.Data.PGSQL")]
 [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly : AssemblyVersion("0.7.5.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
-[assembly : AssemblyFileVersion("0.6.5.0")]
diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
new file mode 100644
index 0000000..7a858b4
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -0,0 +1,99 @@
+: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 '';
+:VERSION 8
+BEGIN TRANSACTION;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/AuthStore.migrations b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
new file mode 100644
index 0000000..a1f5b61
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
@@ -0,0 +1,32 @@
+: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;
diff --git a/OpenSim/Data/PGSQL/Resources/Avatar.migrations b/OpenSim/Data/PGSQL/Resources/Avatar.migrations
new file mode 100644
index 0000000..160086d
--- /dev/null
+++ 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", "Name", cast("Value" as text) FROM Avatars ;
+DROP TABLE Avatars;
+Alter table Tmp_Avatars
+  rename to Avatars;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
new file mode 100644
index 0000000..59270f8
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
@@ -0,0 +1,307 @@
+: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 Sequence estate_settings_id increment by 100 start with 100;
+CREATE TABLE estate_settings(
+        "EstateID" integer DEFAULT nextval('estate_settings_id') 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" integer default nextval('estate_settings_id') 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;
+Create index on estate_settings (lower("EstateName"));
+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;
+:VERSION 10
+BEGIN TRANSACTION;
+ALTER TABLE estate_settings ADD COLUMN "AllowLandmark" boolean NOT NULL default true;
+ALTER TABLE estate_settings ADD COLUMN "AllowParcelChanges" boolean NOT NULL default true;
+ALTER TABLE estate_settings ADD COLUMN "AllowSetHome" boolean NOT NULL default true;
+COMMIT;
+:VERSION 11
+Begin transaction;
+Commit;
diff --git a/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations b/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
new file mode 100644
index 0000000..a87199b
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/FriendsStore.migrations
@@ -0,0 +1,44 @@
+: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;
+ALTER TABLE Friends ADD PRIMARY KEY("PrincipalID", "Friend");
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/GridStore.migrations b/OpenSim/Data/PGSQL/Resources/GridStore.migrations
new file mode 100644
index 0000000..0ab8d2b
--- /dev/null
+++ 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;
diff --git a/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations b/OpenSim/Data/PGSQL/Resources/GridUserStore.migrations
new file mode 100644
index 0000000..d37c4f6d
--- /dev/null
+++ 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 PRIMARY KEY,
+    "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;
diff --git a/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..adf126d
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,17 @@
+:VERSION 1         # -------------------------- 
+BEGIN;
+CREATE TABLE hg_traveling_data (
+    "SessionID" VARCHAR(36) NOT NULL Primary Key,
+    "UserID" VARCHAR(36) NOT NULL,
+        "GridExternalName" VARCHAR(255) NOT NULL DEFAULT '',
+        "ServiceToken" VARCHAR(255) NOT NULL DEFAULT '',
+        "ClientIPAddress" VARCHAR(16) NOT NULL DEFAULT '',
+        "MyIPAddress" VARCHAR(16) NOT NULL DEFAULT '',
+    "TMStamp" timestamp NOT NULL default now()
+);
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/IM_Store.migrations b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
new file mode 100644
index 0000000..eb97824
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/IM_Store.migrations
@@ -0,0 +1,45 @@
+:VERSION 1         # -------------------------- 
+BEGIN Transaction;
+Create Sequence im_offiline_id increment by 1 start with 1;
+CREATE TABLE im_offline (
+  "ID" integer PRIMARY KEY NOT NULL DEFAULT nextval('im_offiline_id') ,
+  "PrincipalID" char(36) NOT NULL default '',
+  "Message" text NOT NULL,
+  "TMStamp" timestamp NOT NULL default now()
+);
+COMMIT;
+:VERSION 2         # -------------------------- 
+BEGIN;
+/*
+INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
+DROP TABLE `diva_im_offline`;
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+*/
+COMMIT;
+:VERSION 3         # -------------------------- 
+BEGIN;
+-- dropping the table here as there most likely is only one record in the table at the time of migration
+DROP TABLE IF EXISTS "public"."im_offline";
+CREATE TABLE "public"."im_offline" (
+        "ID" serial,
+        "PrincipalID" uuid NOT NULL,
+        "Message" text NOT NULL COLLATE "default",
+        "TMStamp" timestamp(6) NOT NULL DEFAULT clock_timestamp(),
+        "FromID" uuid NOT NULL
+)
+WITH (OIDS=FALSE);
+ALTER TABLE "public"."im_offline" ADD PRIMARY KEY ("ID","PrincipalID","FromID") NOT DEFERRABLE INITIALLY IMMEDIATE;
+COMMIT;
+\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
new file mode 100644
index 0000000..8f7982a
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/InventoryStore.migrations
@@ -0,0 +1,220 @@
+: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;
+:VERSION 10
+BEGIN TRANSACTION;
+Alter table inventoryitems Rename Column "SaleType" to "saleType";
+Commit;
diff --git a/OpenSim/Data/PGSQL/Resources/LogStore.migrations b/OpenSim/Data/PGSQL/Resources/LogStore.migrations
new file mode 100644
index 0000000..83727c6
--- /dev/null
+++ 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;
diff --git a/OpenSim/Data/PGSQL/Resources/Presence.migrations b/OpenSim/Data/PGSQL/Resources/Presence.migrations
new file mode 100755
index 0000000..5184034
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/Presence.migrations
@@ -0,0 +1,42 @@
+: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");
+ALTER TABLE Presence ADD "LastSeen" Timestamp;
+COMMIT;
+:VERSION 3         # -------------------------- 
+BEGIN; 
+CREATE INDEX RegionID ON Presence("RegionID");
+COMMIT;
+:VERSION 4         # Making sure LastSeen is actually defined in the table as it most likely erred in the double version 2 migration above 
+BEGIN;
+ALTER TABLE Presence 
+DROP COLUMN IF EXISTS "LastSeen",
+ADD COLUMN "LastSeen" Timestamp;
+COMMIT;
+\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
new file mode 100644
index 0000000..1284ce0
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -0,0 +1,1162 @@
+begin transaction ;
+:VERSION 1
+CREATE TABLE prims(
+        "UUID" varchar(255) NOT NULL Primary key,
+        "RegionUUID" varchar(255) NULL,
+        "ParentID" int NULL,
+        "CreationDate" int NULL,
+        "Name" varchar(255) NULL,
+        "SceneGroupID" varchar(255) NULL,
+        "Text" varchar(255) NULL,
+        "Description" varchar(255) NULL,
+        "SitName" varchar(255) NULL,
+        "TouchName" varchar(255) NULL,
+        "ObjectFlags" int NULL,
+        "CreatorID" varchar(255) NULL,
+        "OwnerID" varchar(255) NULL,
+        "GroupID" varchar(255) NULL,
+        "LastOwnerID" varchar(255) NULL,
+        "OwnerMask" int NULL,
+        "NextOwnerMask" int NULL,
+        "GroupMask" int NULL,
+        "EveryoneMask" int NULL,
+        "BaseMask" int NULL,
+        "PositionX" double precision NULL,
+        "PositionY" double precision NULL,
+        "PositionZ" double precision NULL,
+        "GroupPositionX" double precision NULL,
+        "GroupPositionY" double precision NULL,
+        "GroupPositionZ" double precision NULL,
+        "VelocityX" double precision NULL,
+        "VelocityY" double precision NULL,
+        "VelocityZ" double precision NULL,
+        "AngularVelocityX" double precision NULL,
+        "AngularVelocityY" double precision NULL,
+        "AngularVelocityZ" double precision NULL,
+        "AccelerationX" double precision NULL,
+        "AccelerationY" double precision NULL,
+        "AccelerationZ" double precision NULL,
+        "RotationX" double precision NULL,
+        "RotationY" double precision NULL,
+        "RotationZ" double precision NULL,
+        "RotationW" double precision NULL,
+        "SitTargetOffsetX" double precision NULL,
+        "SitTargetOffsetY" double precision NULL,
+        "SitTargetOffsetZ" double precision NULL,
+        "SitTargetOrientW" double precision NULL,
+        "SitTargetOrientX" double precision NULL,
+        "SitTargetOrientY" double precision NULL,
+        "SitTargetOrientZ" double precision NULL
+        );
+CREATE TABLE primshapes(
+        "UUID" varchar(255) NOT NULL primary key,
+        "Shape" int NULL,
+        "ScaleX" double precision NULL,
+        "ScaleY" double precision NULL,
+        "ScaleZ" double precision NULL,
+        "PCode" int NULL,
+        "PathBegin" int NULL,
+        "PathEnd" int NULL,
+        "PathScaleX" int NULL,
+        "PathScaleY" int NULL,
+        "PathShearX" int NULL,
+        "PathShearY" int NULL,
+        "PathSkew" int NULL,
+        "PathCurve" int NULL,
+        "PathRadiusOffset" int NULL,
+        "PathRevolutions" int NULL,
+        "PathTaperX" int NULL,
+        "PathTaperY" int NULL,
+        "PathTwist" int NULL,
+        "PathTwistBegin" int NULL,
+        "ProfileBegin" int NULL,
+        "ProfileEnd" int NULL,
+        "ProfileCurve" int NULL,
+        "ProfileHollow" int NULL,
+        "State" int NULL,
+        "Texture" bytea NULL,
+        "ExtraParams" bytea NULL
+        );
+CREATE TABLE primitems(
+        "itemID" varchar(255)  NOT NULL primary key,
+        "primID" varchar(255)  NULL,
+        "assetID" varchar(255)  NULL,
+        "parentFolderID" varchar(255)  NULL,
+        "invType" int NULL,
+        "assetType" int NULL,
+        "name" varchar(255)  NULL,
+        "description" varchar(255)  NULL,
+        "creationDate" varchar(255)  NULL,
+        "creatorID" varchar(255)  NULL,
+        "ownerID" varchar(255)  NULL,
+        "lastOwnerID" varchar(255)  NULL,
+        "groupID" varchar(255)  NULL,
+        "nextPermissions" int NULL,
+        "currentPermissions" int NULL,
+        "basePermissions" int NULL,
+        "everyonePermissions" int NULL,
+        "groupPermissions" int NULL
+        );
+CREATE TABLE terrain(
+        "RegionUUID" varchar(255)  NULL,
+        "Revision" int NULL,
+        "Heightfield" bytea NULL
+);
+CREATE TABLE land(
+        "UUID" varchar(255)  NOT NULL primary key,
+        "RegionUUID" varchar(255)  NULL,
+        "LocalLandID" int NULL,
+        "Bitmap" bytea NULL,
+        "Name" varchar(255)  NULL,
+        "Description" varchar(255)  NULL,
+        "OwnerUUID" varchar(255)  NULL,
+        "IsGroupOwned" boolean NULL,
+        "Area" int NULL,
+        "AuctionID" int NULL,
+        "Category" int NULL,
+        "ClaimDate" int NULL,
+        "ClaimPrice" int NULL,
+        "GroupUUID" varchar(255)  NULL,
+        "SalePrice" int NULL,
+        "LandStatus" int NULL,
+        "LandFlags" int NULL,
+        "LandingType" int NULL,
+        "MediaAutoScale" int NULL,
+        "MediaTextureUUID" varchar(255)  NULL,
+        "MediaURL" varchar(255)  NULL,
+        "MusicURL" varchar(255)  NULL,
+        "PassHours" double precision NULL,
+        "PassPrice" int NULL,
+        "SnapshotUUID" varchar(255)  NULL,
+        "UserLocationX" double precision NULL,
+        "UserLocationY" double precision NULL,
+        "UserLocationZ" double precision NULL,
+        "UserLookAtX" double precision NULL,
+        "UserLookAtY" double precision NULL,
+        "UserLookAtZ" double precision NULL
+);
+Create index on land (lower("Name"));
+CREATE TABLE landaccesslist(
+        "LandUUID" varchar(255)  NULL,
+        "AccessUUID" varchar(255)  NULL,
+        "Flags" int NULL
+);
+COMMIT;
+:VERSION 2
+BEGIN TRANSACTION;
+CREATE TABLE regionban (
+        "regionUUID" VARCHAR(36) NOT NULL, 
+        "bannedUUID" VARCHAR(36) NOT NULL, 
+        "bannedIp" VARCHAR(16) NOT NULL, 
+        "bannedIpHostMask" VARCHAR(16) NOT NULL
+        );
+create table regionsettings (
+        "regionUUID" varchar(36) not null primary key,
+        "block_terraform" boolean not null,
+        "block_fly" boolean not null,
+        "allow_damage" boolean not null,
+        "restrict_pushing" boolean not null,
+        "allow_land_resell" boolean not null,
+        "allow_land_join_divide" boolean not null,
+        "block_show_in_search" boolean not null,
+        "agent_limit" int not null,
+        "object_bonus" double precision not null,
+        "maturity" int not null,
+        "disable_scripts" boolean not null,
+        "disable_collisions" boolean not null,
+        "disable_physics" boolean not null,
+        "terrain_texture_1" varchar(36) not null,
+        "terrain_texture_2" varchar(36) not null,
+        "terrain_texture_3" varchar(36) not null,
+        "terrain_texture_4" varchar(36) not null,
+        "elevation_1_nw" double precision not null,
+        "elevation_2_nw" double precision not null,
+        "elevation_1_ne" double precision not null,
+        "elevation_2_ne" double precision not null,
+        "elevation_1_se" double precision not null,
+        "elevation_2_se" double precision not null,
+        "elevation_1_sw" double precision not null,
+        "elevation_2_sw" double precision not null,
+        "water_height" double precision not null,
+        "terrain_raise_limit" double precision not null,
+        "terrain_lower_limit" double precision not null,
+        "use_estate_sun" boolean not null,
+        "fixed_sun" boolean not null,
+        "sun_position" double precision not null,
+        "covenant" varchar(36) default NULL,
+        "Sandbox" boolean NOT NULL
+        );
+COMMIT;
+:VERSION 3
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_prims
+        (
+        "UUID" varchar(36) NOT NULL ,
+        "RegionUUID" varchar(36) NULL,
+        "ParentID" int NULL,
+        "CreationDate" int NULL,
+        "Name" varchar(255) NULL,
+        "SceneGroupID" varchar(36) NULL,
+        "Text" varchar(255) NULL,
+        "Description" varchar(255) NULL,
+        "SitName" varchar(255) NULL,
+        "TouchName" varchar(255) NULL,
+        "ObjectFlags" int NULL,
+        "CreatorID" varchar(36) NULL,
+        "OwnerID" varchar(36) NULL,
+        "GroupID" varchar(36) NULL,
+        "LastOwnerID" varchar(36) NULL,
+        "OwnerMask" int NULL,
+        "NextOwnerMask" int NULL,
+        "GroupMask" int NULL,
+        "EveryoneMask" int NULL,
+        "BaseMask" int NULL,
+        "PositionX" double precision NULL,
+        "PositionY" double precision NULL,
+        "PositionZ" double precision NULL,
+        "GroupPositionX" double precision NULL,
+        "GroupPositionY" double precision NULL,
+        "GroupPositionZ" double precision NULL,
+        "VelocityX" double precision NULL,
+        "VelocityY" double precision NULL,
+        "VelocityZ" double precision NULL,
+        "AngularVelocityX" double precision NULL,
+        "AngularVelocityY" double precision NULL,
+        "AngularVelocityZ" double precision NULL,
+        "AccelerationX" double precision NULL,
+        "AccelerationY" double precision NULL,
+        "AccelerationZ" double precision NULL,
+        "RotationX" double precision NULL,
+        "RotationY" double precision NULL,
+        "RotationZ" double precision NULL,
+        "RotationW" double precision NULL,
+        "SitTargetOffsetX" double precision NULL,
+        "SitTargetOffsetY" double precision NULL,
+        "SitTargetOffsetZ" double precision NULL,
+        "SitTargetOrientW" double precision NULL,
+        "SitTargetOrientX" double precision NULL,
+        "SitTargetOrientY" double precision NULL,
+        "SitTargetOrientZ" double precision NULL
+        );
+INSERT INTO Tmp_prims ("UUID", "RegionUUID", "ParentID", "CreationDate", "Name", "SceneGroupID", "Text", "Description", "SitName", "TouchName", "ObjectFlags", "CreatorID", "OwnerID", "GroupID", "LastOwnerID", "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ")
+        SELECT cast("UUID" as varchar(36)), cast("RegionUUID" as varchar(36)), "ParentID", "CreationDate", "Name", cast("SceneGroupID" as varchar(36)), "Text", "Description", "SitName", "TouchName", "ObjectFlags", cast("CreatorID" as varchar(36)), cast("OwnerID" as varchar(36)), cast( "GroupID" as varchar(36)), cast("LastOwnerID" as varchar(36)), "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ" 
+        FROM prims ;
+DROP TABLE prims;
+alter table Tmp_prims rename to prims;
+ALTER TABLE prims ADD CONSTRAINT
+        PK__prims__10566F31 PRIMARY KEY 
+        (
+        "UUID"
+        );
+COMMIT;
+:VERSION 4
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_primitems
+        (
+        "itemID" varchar(36) NOT NULL,
+        "primID" varchar(36) NULL,
+        "assetID" varchar(36) NULL,
+        "parentFolderID" varchar(36) NULL,
+        "invType" int NULL,
+        "assetType" int NULL,
+        "name" varchar(255) NULL,
+        "description" varchar(255) NULL,
+        "creationDate" varchar(255) NULL,
+        "creatorID" varchar(36) NULL,
+        "ownerID" varchar(36) NULL,
+        "lastOwnerID" varchar(36) NULL,
+        "groupID" varchar(36) NULL,
+        "nextPermissions" int NULL,
+        "currentPermissions" int NULL,
+        "basePermissions" int NULL,
+        "everyonePermissions" int NULL,
+        "groupPermissions" int NULL
+        );
+INSERT INTO Tmp_primitems ("itemID", "primID", "assetID", "parentFolderID", "invType", "assetType", "name", "description", "creationDate", "creatorID", "ownerID", "lastOwnerID", "groupID", "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions")
+        SELECT cast("itemID" as varchar(36)), cast("primID" as varchar(36)), cast("assetID" as varchar(36)), cast( "parentFolderID" as varchar(36)), "invType", "assetType", "name", "description", "creationDate", cast( "creatorID" as varchar(36)), cast("ownerID" as varchar(36)), cast("lastOwnerID" as varchar(36)), cast("groupID" as varchar(36)), "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions"
+          from primitems;
+DROP TABLE primitems;
+alter table Tmp_primitems rename to primitems;
+ALTER TABLE primitems ADD CONSTRAINT
+        PK__primitems__0A688BB1 PRIMARY KEY 
+        (
+        "itemID"
+        );
+COMMIT;
+:VERSION 5
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_primshapes
+        (
+        "UUID" varchar(36) NOT NULL,
+        "Shape" int NULL,
+        "ScaleX" double precision NULL,
+        "ScaleY" double precision NULL,
+        "ScaleZ" double precision NULL,
+        "PCode" int NULL,
+        "PathBegin" int NULL,
+        "PathEnd" int NULL,
+        "PathScaleX" int NULL,
+        "PathScaleY" int NULL,
+        "PathShearX" int NULL,
+        "PathShearY" int NULL,
+        "PathSkew" int NULL,
+        "PathCurve" int NULL,
+        "PathRadiusOffset" int NULL,
+        "PathRevolutions" int NULL,
+        "PathTaperX" int NULL,
+        "PathTaperY" int NULL,
+        "PathTwist" int NULL,
+        "PathTwistBegin" int NULL,
+        "ProfileBegin" int NULL,
+        "ProfileEnd" int NULL,
+        "ProfileCurve" int NULL,
+        "ProfileHollow" int NULL,
+        "State" int NULL,
+        "Texture" bytea NULL,
+        "ExtraParams" bytea NULL
+        ) ;
+INSERT INTO Tmp_primshapes ("UUID", "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams")
+        SELECT cast("UUID" as varchar(36)), "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams" 
+        FROM primshapes;
+DROP TABLE primshapes;
+alter table Tmp_primshapes rename to primshapes;
+ALTER TABLE primshapes ADD CONSTRAINT
+        PK__primshapes__0880433F PRIMARY KEY 
+        (
+        "UUID"
+        ) ;
+COMMIT;
+:VERSION 6
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "PayPrice" int not null default 0;
+ALTER TABLE prims ADD "PayButton1" int not null default 0;
+ALTER TABLE prims ADD "PayButton2" int not null default 0;
+ALTER TABLE prims ADD "PayButton3" int not null default 0;
+ALTER TABLE prims ADD "PayButton4" int not null default 0;
+ALTER TABLE prims ADD "LoopedSound" varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE prims ADD "LoopedSoundGain" double precision not null default 0.0;
+ALTER TABLE prims ADD "TextureAnimation" bytea;
+ALTER TABLE prims ADD "OmegaX" double precision not null default 0.0;
+ALTER TABLE prims ADD "OmegaY" double precision not null default 0.0;
+ALTER TABLE prims ADD "OmegaZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetX" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetY" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraEyeOffsetZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetX" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetY" double precision not null default 0.0;
+ALTER TABLE prims ADD "CameraAtOffsetZ" double precision not null default 0.0;
+ALTER TABLE prims ADD "ForceMouselook" smallint not null default 0;
+ALTER TABLE prims ADD "ScriptAccessPin" int not null default 0;
+ALTER TABLE prims ADD "AllowedDrop" smallint not null default 0;
+ALTER TABLE prims ADD "DieAtEdge" smallint not null default 0;
+ALTER TABLE prims ADD "SalePrice" int not null default 10;
+ALTER TABLE prims ADD "SaleType" smallint not null default 0;
+ALTER TABLE primitems add "flags" integer not null default 0;
+ALTER TABLE land ADD "AuthbuyerID" varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+CREATE index prims_regionuuid on prims("RegionUUID");
+CREATE index prims_parentid on prims("ParentID");
+CREATE index primitems_primid on primitems("primID");
+COMMIT;
+:VERSION 7
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "ColorR" int not null default 0;
+ALTER TABLE prims ADD "ColorG" int not null default 0;
+ALTER TABLE prims ADD "ColorB" int not null default 0;
+ALTER TABLE prims ADD "ColorA" int not null default 0;
+ALTER TABLE prims ADD "ParticleSystem" bytea;
+ALTER TABLE prims ADD "ClickAction" smallint NOT NULL default 0;
+COMMIT;
+:VERSION 8
+BEGIN TRANSACTION;
+ALTER TABLE land ADD "OtherCleanTime" integer NOT NULL default 0;
+ALTER TABLE land ADD "Dwell" integer NOT NULL default 0;
+COMMIT;
+:VERSION 9
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "Material" smallint NOT NULL default 3;
+COMMIT;
+:VERSION 10
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings ADD "sunvectorx" double precision NOT NULL default 0;
+ALTER TABLE regionsettings ADD "sunvectory" double precision NOT NULL default 0;
+ALTER TABLE regionsettings ADD "sunvectorz" double precision NOT NULL default 0;
+COMMIT;
+:VERSION 11
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "CollisionSound" char(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE prims ADD "CollisionSoundVolume" double precision not null default 0.0;
+COMMIT;
+:VERSION 12
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "LinkNumber" integer not null default 0;
+COMMIT;
+:VERSION 13
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_prims
+        (
+        "UUID" uuid NOT NULL,
+        "RegionUUID" uuid NULL,
+        "ParentID" int NULL,
+        "CreationDate" int NULL,
+        "Name" varchar(255) NULL,
+        "SceneGroupID" uuid NULL,
+        "Text" varchar(255) NULL,
+        "Description" varchar(255) NULL,
+        "SitName" varchar(255) NULL,
+        "TouchName" varchar(255) NULL,
+        "ObjectFlags" int NULL,
+        "CreatorID" uuid NULL,
+        "OwnerID" uuid NULL,
+        "GroupID" uuid NULL,
+        "LastOwnerID" uuid NULL,
+        "OwnerMask" int NULL,
+        "NextOwnerMask" int NULL,
+        "GroupMask" int NULL,
+        "EveryoneMask" int NULL,
+        "BaseMask" int NULL,
+        "PositionX" double precision NULL,
+        "PositionY" double precision NULL,
+        "PositionZ" double precision NULL,
+        "GroupPositionX" double precision NULL,
+        "GroupPositionY" double precision NULL,
+        "GroupPositionZ" double precision NULL,
+        "VelocityX" double precision NULL,
+        "VelocityY" double precision NULL,
+        "VelocityZ" double precision NULL,
+        "AngularVelocityX" double precision NULL,
+        "AngularVelocityY" double precision NULL,
+        "AngularVelocityZ" double precision NULL,
+        "AccelerationX" double precision NULL,
+        "AccelerationY" double precision NULL,
+        "AccelerationZ" double precision NULL,
+        "RotationX" double precision NULL,
+        "RotationY" double precision NULL,
+        "RotationZ" double precision NULL,
+        "RotationW" double precision NULL,
+        "SitTargetOffsetX" double precision NULL,
+        "SitTargetOffsetY" double precision NULL,
+        "SitTargetOffsetZ" double precision NULL,
+        "SitTargetOrientW" double precision NULL,
+        "SitTargetOrientX" double precision NULL,
+        "SitTargetOrientY" double precision NULL,
+        "SitTargetOrientZ" double precision NULL,
+        "PayPrice" int NOT NULL DEFAULT ((0)),
+        "PayButton1" int NOT NULL DEFAULT ((0)),
+        "PayButton2" int NOT NULL DEFAULT ((0)),
+        "PayButton3" int NOT NULL DEFAULT ((0)),
+        "PayButton4" int NOT NULL DEFAULT ((0)),
+        "LoopedSound" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        "LoopedSoundGain" double precision NOT NULL DEFAULT ((0.0)),
+        "TextureAnimation" bytea NULL,
+        "OmegaX" double precision NOT NULL DEFAULT ((0.0)),
+        "OmegaY" double precision NOT NULL DEFAULT ((0.0)),
+        "OmegaZ" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraEyeOffsetX" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraEyeOffsetY" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraEyeOffsetZ" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraAtOffsetX" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraAtOffsetY" double precision NOT NULL DEFAULT ((0.0)),
+        "CameraAtOffsetZ" double precision NOT NULL DEFAULT ((0.0)),
+        "ForceMouselook" smallint NOT NULL DEFAULT ((0)),
+        "ScriptAccessPin" int NOT NULL DEFAULT ((0)),
+        "AllowedDrop" smallint NOT NULL DEFAULT ((0)),
+        "DieAtEdge" smallint NOT NULL DEFAULT ((0)),
+        "SalePrice" int NOT NULL DEFAULT ((10)),
+        "SaleType" smallint NOT NULL DEFAULT ((0)),
+        "ColorR" int NOT NULL DEFAULT ((0)),
+        "ColorG" int NOT NULL DEFAULT ((0)),
+        "ColorB" int NOT NULL DEFAULT ((0)),
+        "ColorA" int NOT NULL DEFAULT ((0)),
+        "ParticleSystem" bytea NULL,
+        "ClickAction" smallint NOT NULL DEFAULT ((0)),
+        "Material" smallint NOT NULL DEFAULT ((3)),
+        "CollisionSound" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        "CollisionSoundVolume" double precision NOT NULL DEFAULT ((0.0)),
+        "LinkNumber" int NOT NULL DEFAULT ((0))
+        );
+INSERT INTO Tmp_prims ("UUID", "RegionUUID", "ParentID", "CreationDate", "Name", "SceneGroupID", "Text", "Description", "SitName", "TouchName", "ObjectFlags", "CreatorID", "OwnerID", "GroupID", "LastOwnerID", "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ", "PayPrice", "PayButton1", "PayButton2", "PayButton3", "PayButton4", "LoopedSound", "LoopedSoundGain", "TextureAnimation", "OmegaX", "OmegaY", "OmegaZ", "CameraEyeOffsetX", "CameraEyeOffsetY", "CameraEyeOffsetZ", "CameraAtOffsetX", "CameraAtOffsetY", "CameraAtOffsetZ", "ForceMouselook", "ScriptAccessPin", "AllowedDrop", "DieAtEdge", "SalePrice", "SaleType", "ColorR", "ColorG", "ColorB", "ColorA", "ParticleSystem", "ClickAction", "Material", "CollisionSound", "CollisionSoundVolume", "LinkNumber")
+        SELECT cast("UUID" as uuid), cast("RegionUUID" as uuid), "ParentID", "CreationDate", "Name", cast("SceneGroupID" as uuid), "Text", "Description", "SitName", "TouchName", "ObjectFlags", cast("CreatorID" as uuid), cast("OwnerID" as uuid), cast("GroupID" as uuid), cast("LastOwnerID" as uuid), "OwnerMask", "NextOwnerMask", "GroupMask", "EveryoneMask", "BaseMask", "PositionX", "PositionY", "PositionZ", "GroupPositionX", "GroupPositionY", "GroupPositionZ", "VelocityX", "VelocityY", "VelocityZ", "AngularVelocityX", "AngularVelocityY", "AngularVelocityZ", "AccelerationX", "AccelerationY", "AccelerationZ", "RotationX", "RotationY", "RotationZ", "RotationW", "SitTargetOffsetX", "SitTargetOffsetY", "SitTargetOffsetZ", "SitTargetOrientW", "SitTargetOrientX", "SitTargetOrientY", "SitTargetOrientZ", "PayPrice", "PayButton1", "PayButton2", "PayButton3", "PayButton4", cast("LoopedSound" as uuid), "LoopedSoundGain", "TextureAnimation", "OmegaX", "OmegaY", "OmegaZ", "CameraEyeOffsetX", "CameraEyeOffsetY", "CameraEyeOffsetZ", "CameraAtOffsetX", "CameraAtOffsetY", "CameraAtOffsetZ", "ForceMouselook", "ScriptAccessPin", "AllowedDrop", "DieAtEdge", "SalePrice", "SaleType", "ColorR", "ColorG", "ColorB", "ColorA", "ParticleSystem", "ClickAction", "Material", cast("CollisionSound" as uuid), "CollisionSoundVolume", "LinkNumber" 
+         FROM prims ;
+DROP TABLE prims;
+alter table Tmp_prims rename to prims;
+ALTER TABLE prims ADD CONSTRAINT
+        PK__prims__10566F31 PRIMARY KEY 
+        (
+        "UUID"
+        );
+CREATE INDEX prims_regionuuid ON prims
+        (
+        "RegionUUID"
+        );
+CREATE INDEX prims_parentid ON prims
+        (
+        "ParentID"
+        );
+COMMIT;
+:VERSION 14
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_primshapes
+        (
+        "UUID" uuid NOT NULL,
+        "Shape" int NULL,
+        "ScaleX" double precision NULL,
+        "ScaleY" double precision NULL,
+        "ScaleZ" double precision NULL,
+        "PCode" int NULL,
+        "PathBegin" int NULL,
+        "PathEnd" int NULL,
+        "PathScaleX" int NULL,
+        "PathScaleY" int NULL,
+        "PathShearX" int NULL,
+        "PathShearY" int NULL,
+        "PathSkew" int NULL,
+        "PathCurve" int NULL,
+        "PathRadiusOffset" int NULL,
+        "PathRevolutions" int NULL,
+        "PathTaperX" int NULL,
+        "PathTaperY" int NULL,
+        "PathTwist" int NULL,
+        "PathTwistBegin" int NULL,
+        "ProfileBegin" int NULL,
+        "ProfileEnd" int NULL,
+        "ProfileCurve" int NULL,
+        "ProfileHollow" int NULL,
+        "State" int NULL,
+        "Texture" bytea NULL,
+        "ExtraParams" bytea NULL
+        );
+INSERT INTO Tmp_primshapes ("UUID", "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams")
+        SELECT cast("UUID" as uuid), "Shape", "ScaleX", "ScaleY", "ScaleZ", "PCode", "PathBegin", "PathEnd", "PathScaleX", "PathScaleY", "PathShearX", "PathShearY", "PathSkew", "PathCurve", "PathRadiusOffset", "PathRevolutions", "PathTaperX", "PathTaperY", "PathTwist", "PathTwistBegin", "ProfileBegin", "ProfileEnd", "ProfileCurve", "ProfileHollow", "State", "Texture", "ExtraParams" 
+        FROM primshapes;
+DROP TABLE primshapes;
+alter table Tmp_primshapes rename to primshapes;
+ALTER TABLE primshapes ADD CONSTRAINT
+        PK__primshapes__0880433F PRIMARY KEY 
+        (
+        "UUID"
+        );
+COMMIT;
+:VERSION 15
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_primitems
+        (
+        "itemID" uuid NOT NULL,
+        "primID" uuid NULL,
+        "assetID" uuid NULL,
+        "parentFolderID" uuid NULL,
+        "invType" int NULL,
+        "assetType" int NULL,
+        "name" varchar(255) NULL,
+        "description" varchar(255) NULL,
+        "creationDate" varchar(255) NULL,
+        "creatorID" uuid NULL,
+        "ownerID" uuid NULL,
+        "lastOwnerID" uuid NULL,
+        "groupID" uuid NULL,
+        "nextPermissions" int NULL,
+        "currentPermissions" int NULL,
+        "basePermissions" int NULL,
+        "everyonePermissions" int NULL,
+        "groupPermissions" int NULL,
+        flags int NOT NULL DEFAULT ((0))
+        );
+INSERT INTO Tmp_primitems ("itemID", "primID", "assetID", "parentFolderID", "invType", "assetType", "name", "description", "creationDate", "creatorID", "ownerID", "lastOwnerID", "groupID", "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions", flags)
+        SELECT cast("itemID" as uuid), cast("primID" as uuid), cast("assetID" as uuid), cast("parentFolderID" as uuid), "invType", "assetType", "name", "description", "creationDate", cast("creatorID" as uuid), cast("ownerID" as uuid), cast("lastOwnerID" as uuid), cast("groupID" as uuid), "nextPermissions", "currentPermissions", "basePermissions", "everyonePermissions", "groupPermissions", flags 
+        FROM primitems ;
+DROP TABLE primitems;
+alter table Tmp_primitems rename to primitems;
+ALTER TABLE primitems ADD CONSTRAINT
+        PK__primitems__0A688BB1 PRIMARY KEY 
+        (
+        "itemID"
+        );
+CREATE INDEX primitems_primid ON primitems
+        (
+        "primID"
+        ) ;
+COMMIT;
+:VERSION 16
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_terrain
+        (
+        "RegionUUID" uuid NULL,
+        "Revision" int NULL,
+        "Heightfield" bytea NULL
+        );
+INSERT INTO Tmp_terrain ("RegionUUID", "Revision", "Heightfield")
+        SELECT cast("RegionUUID" as uuid), "Revision", "Heightfield" 
+        FROM terrain ;
+DROP TABLE terrain;
+alter table Tmp_terrain rename to terrain;
+COMMIT;
+:VERSION 17
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_land
+        (
+        "UUID" uuid NOT NULL,
+        "RegionUUID" uuid NULL,
+        "LocalLandID" int NULL,
+        "Bitmap" bytea NULL,
+        "Name" varchar(255) NULL,
+        "Description" varchar(255) NULL,
+        "OwnerUUID" uuid NULL,
+        "IsGroupOwned" boolean NULL,
+        "Area" int NULL,
+        "AuctionID" int NULL,
+        "Category" int NULL,
+        "ClaimDate" int NULL,
+        "ClaimPrice" int NULL,
+        "GroupUUID" uuid NULL,
+        "SalePrice" int NULL,
+        "LandStatus" int NULL,
+        "LandFlags" int NULL,
+        "LandingType" int NULL,
+        "MediaAutoScale" int NULL,
+        "MediaTextureUUID" uuid NULL,
+        "MediaURL" varchar(255) NULL,
+        "MusicURL" varchar(255) NULL,
+        "PassHours" double precision NULL,
+        "PassPrice" int NULL,
+        "SnapshotUUID" uuid NULL,
+        "UserLocationX" double precision NULL,
+        "UserLocationY" double precision NULL,
+        "UserLocationZ" double precision NULL,
+        "UserLookAtX" double precision NULL,
+        "UserLookAtY" double precision NULL,
+        "UserLookAtZ" double precision NULL,
+        "AuthbuyerID" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        "OtherCleanTime" int NOT NULL DEFAULT ((0)),
+        "Dwell" int NOT NULL DEFAULT ((0))
+        );
+        
+INSERT INTO Tmp_land ("UUID", "RegionUUID", "LocalLandID", "Bitmap", "Name", "Description", "OwnerUUID", "IsGroupOwned", "Area", "AuctionID", "Category", "ClaimDate", "ClaimPrice", "GroupUUID", "SalePrice", "LandStatus", "LandFlags", "LandingType", "MediaAutoScale", "MediaTextureUUID", "MediaURL", "MusicURL", "PassHours", "PassPrice", "SnapshotUUID", "UserLocationX", "UserLocationY", "UserLocationZ", "UserLookAtX", "UserLookAtY", "UserLookAtZ", "AuthbuyerID", "OtherCleanTime", "Dwell")
+        SELECT cast("UUID" as uuid), cast("RegionUUID" as uuid), "LocalLandID", "Bitmap", "Name", "Description", cast("OwnerUUID" as uuid), "IsGroupOwned", "Area", "AuctionID", "Category", "ClaimDate", "ClaimPrice", cast("GroupUUID" as uuid), "SalePrice", "LandStatus", "LandFlags", "LandingType", "MediaAutoScale", cast("MediaTextureUUID" as uuid), "MediaURL", "MusicURL", "PassHours", "PassPrice", cast("SnapshotUUID" as uuid), "UserLocationX", "UserLocationY", "UserLocationZ", "UserLookAtX", "UserLookAtY", "UserLookAtZ", cast("AuthbuyerID" as uuid), "OtherCleanTime", "Dwell" 
+        FROM land ;
+DROP TABLE land;
+alter table Tmp_land rename to land;
+ALTER TABLE land ADD CONSTRAINT
+        PK__land__65A475E71BFD2C07 PRIMARY KEY 
+        (
+        "UUID"
+        );
+Create index on land (lower("Name"));
+COMMIT;
+:VERSION 18
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_landaccesslist
+        (
+        "LandUUID" uuid NULL,
+        "AccessUUID" uuid NULL,
+        "Flags" int NULL
+        );
+INSERT INTO Tmp_landaccesslist ("LandUUID", "AccessUUID", "Flags")
+        SELECT cast("LandUUID" as uuid), cast("AccessUUID" as uuid), "Flags" 
+        FROM landaccesslist ;
+DROP TABLE landaccesslist;
+alter table Tmp_landaccesslist rename to landaccesslist;
+COMMIT;
+:VERSION 19
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_regionban
+        (
+        "regionUUID" uuid NOT NULL,
+        "bannedUUID" uuid NOT NULL,
+        "bannedIp" varchar(16) NOT NULL,
+        "bannedIpHostMask" varchar(16) NOT NULL
+        );
+INSERT INTO Tmp_regionban ("regionUUID", "bannedUUID", "bannedIp", "bannedIpHostMask")
+        SELECT cast("regionUUID" as uuid), cast("bannedUUID" as uuid), "bannedIp", "bannedIpHostMask" 
+        FROM regionban ;
+DROP TABLE regionban;
+alter table Tmp_regionban rename to regionban;
+COMMIT;
+:VERSION 20
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_regionsettings
+        (
+        "regionUUID" uuid NOT NULL,
+        "block_terraform" boolean NOT NULL,
+        "block_fly" boolean NOT NULL,
+        "allow_damage" boolean NOT NULL,
+        "restrict_pushing" boolean NOT NULL,
+        "allow_land_resell" boolean NOT NULL,
+        "allow_land_join_divide" boolean NOT NULL,
+        "block_show_in_search" boolean NOT NULL,
+        "agent_limit" int NOT NULL,
+        "object_bonus" double precision NOT NULL,
+        "maturity" int NOT NULL,
+        "disable_scripts" boolean NOT NULL,
+        "disable_collisions" boolean NOT NULL,
+        "disable_physics" boolean NOT NULL,
+        "terrain_texture_1" uuid NOT NULL,
+        "terrain_texture_2" uuid NOT NULL,
+        "terrain_texture_3" uuid NOT NULL,
+        "terrain_texture_4" uuid NOT NULL,
+        "elevation_1_nw" double precision NOT NULL,
+        "elevation_2_nw" double precision NOT NULL,
+        "elevation_1_ne" double precision NOT NULL,
+        "elevation_2_ne" double precision NOT NULL,
+        "elevation_1_se" double precision NOT NULL,
+        "elevation_2_se" double precision NOT NULL,
+        "elevation_1_sw" double precision NOT NULL,
+        "elevation_2_sw" double precision NOT NULL,
+        "water_height" double precision NOT NULL,
+        "terrain_raise_limit" double precision NOT NULL,
+        "terrain_lower_limit" double precision NOT NULL,
+        "use_estate_sun" boolean NOT NULL,
+        "fixed_sun" boolean NOT NULL,
+        "sun_position" double precision NOT NULL,
+        "covenant" uuid NULL DEFAULT (NULL),
+        "Sandbox" boolean NOT NULL,
+        "sunvectorx" double precision NOT NULL DEFAULT ((0)),
+        "sunvectory" double precision NOT NULL DEFAULT ((0)),
+        "sunvectorz" double precision NOT NULL DEFAULT ((0))
+        );
+INSERT INTO Tmp_regionsettings ("regionUUID", "block_terraform", "block_fly", "allow_damage", "restrict_pushing", "allow_land_resell", "allow_land_join_divide", "block_show_in_search", "agent_limit", "object_bonus", "maturity", "disable_scripts", "disable_collisions", "disable_physics", "terrain_texture_1", "terrain_texture_2", "terrain_texture_3", "terrain_texture_4", "elevation_1_nw", "elevation_2_nw", "elevation_1_ne", "elevation_2_ne", "elevation_1_se", "elevation_2_se", "elevation_1_sw", "elevation_2_sw", "water_height", "terrain_raise_limit", "terrain_lower_limit", "use_estate_sun", "fixed_sun", "sun_position", "covenant", "Sandbox", "sunvectorx", "sunvectory", "sunvectorz")
+        SELECT cast("regionUUID" as uuid), "block_terraform", "block_fly", "allow_damage", "restrict_pushing", "allow_land_resell", "allow_land_join_divide", "block_show_in_search", "agent_limit", "object_bonus", "maturity", "disable_scripts", "disable_collisions", "disable_physics", cast("terrain_texture_1" as uuid), cast("terrain_texture_2" as uuid), cast("terrain_texture_3" as uuid), cast("terrain_texture_4" as uuid), "elevation_1_nw", "elevation_2_nw", "elevation_1_ne", "elevation_2_ne", "elevation_1_se", "elevation_2_se", "elevation_1_sw", "elevation_2_sw", "water_height", "terrain_raise_limit", "terrain_lower_limit", "use_estate_sun", "fixed_sun", "sun_position", cast("covenant" as uuid), "Sandbox", "sunvectorx", "sunvectory", "sunvectorz" 
+        FROM regionsettings ;
+DROP TABLE regionsettings;
+alter table Tmp_regionsettings rename to regionsettings;
+ALTER TABLE regionsettings ADD CONSTRAINT
+        PK__regionse__5B35159D21B6055D PRIMARY KEY 
+        (
+        "regionUUID"
+        );
+COMMIT;
+:VERSION 21
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "PassTouches" boolean not null default false;
+COMMIT;
+:VERSION 22
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings ADD "loaded_creation_date" varchar(20) ;
+ALTER TABLE regionsettings ADD "loaded_creation_time" varchar(20) ;
+ALTER TABLE regionsettings ADD "loaded_creation_id" varchar(64) ;
+COMMIT;
+:VERSION 23
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings DROP COLUMN "loaded_creation_date";
+ALTER TABLE regionsettings DROP COLUMN "loaded_creation_time";
+ALTER TABLE regionsettings ADD "loaded_creation_datetime" int NOT NULL default 0;
+COMMIT;
+:VERSION 24
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD  "MediaURL" varchar(255);
+ALTER TABLE primshapes ADD "Media" TEXT NULL;
+COMMIT;
+:VERSION 25
+BEGIN TRANSACTION;
+CREATE TABLE regionwindlight (
+  "region_id" varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
+  "water_color_r" double precision NOT NULL DEFAULT '4.000000',
+  water_color_g double precision NOT NULL DEFAULT '38.000000',
+  water_color_b double precision NOT NULL DEFAULT '64.000000',
+  water_fog_density_exponent double precision NOT NULL DEFAULT '4.0',
+  underwater_fog_modifier double precision NOT NULL DEFAULT '0.25',
+  reflection_wavelet_scale_1 double precision NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_2 double precision NOT NULL DEFAULT '2.0',
+  reflection_wavelet_scale_3 double precision NOT NULL DEFAULT '2.0',
+  fresnel_scale double precision NOT NULL DEFAULT '0.40',
+  fresnel_offset double precision NOT NULL DEFAULT '0.50',
+  refract_scale_above double precision NOT NULL DEFAULT '0.03',
+  refract_scale_below double precision NOT NULL DEFAULT '0.20',
+  blur_multiplier double precision NOT NULL DEFAULT '0.040',
+  big_wave_direction_x double precision NOT NULL DEFAULT '1.05',
+  big_wave_direction_y double precision NOT NULL DEFAULT '-0.42',
+  little_wave_direction_x double precision NOT NULL DEFAULT '1.11',
+  little_wave_direction_y double precision NOT NULL DEFAULT '-1.16',
+  normal_map_texture varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  horizon_r double precision NOT NULL DEFAULT '0.25',
+  horizon_g double precision NOT NULL DEFAULT '0.25',
+  horizon_b double precision NOT NULL DEFAULT '0.32',
+  horizon_i double precision NOT NULL DEFAULT '0.32',
+  haze_horizon double precision NOT NULL DEFAULT '0.19',
+  blue_density_r double precision NOT NULL DEFAULT '0.12',
+  blue_density_g double precision NOT NULL DEFAULT '0.22',
+  blue_density_b double precision NOT NULL DEFAULT '0.38',
+  blue_density_i double precision NOT NULL DEFAULT '0.38',
+  haze_density double precision NOT NULL DEFAULT '0.70',
+  density_multiplier double precision NOT NULL DEFAULT '0.18',
+  distance_multiplier double precision NOT NULL DEFAULT '0.8',
+  max_altitude int NOT NULL DEFAULT '1605',
+  sun_moon_color_r double precision NOT NULL DEFAULT '0.24',
+  sun_moon_color_g double precision NOT NULL DEFAULT '0.26',
+  sun_moon_color_b double precision NOT NULL DEFAULT '0.30',
+  sun_moon_color_i double precision NOT NULL DEFAULT '0.30',
+  sun_moon_position double precision NOT NULL DEFAULT '0.317',
+  ambient_r double precision NOT NULL DEFAULT '0.35',
+  ambient_g double precision NOT NULL DEFAULT '0.35',
+  ambient_b double precision NOT NULL DEFAULT '0.35',
+  ambient_i double precision NOT NULL DEFAULT '0.35',
+  east_angle double precision NOT NULL DEFAULT '0.00',
+  sun_glow_focus double precision NOT NULL DEFAULT '0.10',
+  sun_glow_size double precision NOT NULL DEFAULT '1.75',
+  scene_gamma double precision NOT NULL DEFAULT '1.00',
+  star_brightness double precision NOT NULL DEFAULT '0.00',
+  cloud_color_r double precision NOT NULL DEFAULT '0.41',
+  cloud_color_g double precision NOT NULL DEFAULT '0.41',
+  cloud_color_b double precision NOT NULL DEFAULT '0.41',
+  cloud_color_i double precision NOT NULL DEFAULT '0.41',
+  cloud_x double precision NOT NULL DEFAULT '1.00',
+  cloud_y double precision NOT NULL DEFAULT '0.53',
+  cloud_density double precision NOT NULL DEFAULT '1.00',
+  cloud_coverage double precision NOT NULL DEFAULT '0.27',
+  cloud_scale double precision NOT NULL DEFAULT '0.42',
+  cloud_detail_x double precision NOT NULL DEFAULT '1.00',
+  cloud_detail_y double precision NOT NULL DEFAULT '0.53',
+  cloud_detail_density double precision NOT NULL DEFAULT '0.12',
+  cloud_scroll_x double precision NOT NULL DEFAULT '0.20',
+  cloud_scroll_x_lock smallint NOT NULL DEFAULT '0',
+  cloud_scroll_y double precision NOT NULL DEFAULT '0.01',
+  cloud_scroll_y_lock smallint NOT NULL DEFAULT '0',
+  draw_classic_clouds smallint NOT NULL DEFAULT '1'  
+);
+COMMIT;
+:VERSION 26
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings ADD "map_tile_ID" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;
+:VERSION 27         #---------------------
+BEGIN TRANSACTION;
+ALTER TABLE land ADD "MediaType" VARCHAR(32) NOT NULL DEFAULT 'none/none' ;
+ALTER TABLE land ADD "MediaDescription" VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE land ADD "MediaSize" VARCHAR(16) NOT NULL DEFAULT '0,0';
+ALTER TABLE land ADD "MediaLoop" boolean NOT NULL DEFAULT false;
+ALTER TABLE land ADD "ObscureMusic" boolean NOT NULL DEFAULT false;
+ALTER TABLE land ADD "ObscureMedia" boolean NOT NULL DEFAULT false;
+COMMIT;
+:VERSION 28         #---------------------
+BEGIN TRANSACTION;
+ALTER TABLE prims 
+alter column "CreatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+ALTER TABLE prims  ALTER COLUMN "CreatorID" set NOT NULL;
+ALTER TABLE primitems
+alter column "creatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+ALTER TABLE primitems ALTER COLUMN "creatorID" set NOT NULL;
+COMMIT;
+:VERSION 29         #----------------- Region Covenant changed time
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings ADD "covenant_datetime" int NOT NULL default 0;
+COMMIT;
+:VERSION 30         #------------------Migrate "creatorID" storage to varchars instead of UUIDs for HG support
+BEGIN TRANSACTION;
+alter table prims rename column "CreatorID" to "CreatorIDOld";
+alter table primitems rename column "creatorID" to "creatorIDOld";
+COMMIT;
+:VERSION 31        #---------------------
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "CreatorID" varchar(255);
+ALTER TABLE primitems ADD "creatorID" varchar(255);
+COMMIT;
+:VERSION 32        #---------------------
+BEGIN TRANSACTION;
+UPDATE prims SET "CreatorID" = cast("CreatorIDOld" as varchar(255));
+UPDATE primitems SET "creatorID" = cast("creatorIDOld" as varchar(255));
+COMMIT;
+:VERSION 33       #---------------------
+BEGIN TRANSACTION;
+ALTER TABLE prims alter column "CreatorID" set default '00000000-0000-0000-0000-000000000000' ;
+ALTER TABLE prims ALTER COLUMN "CreatorID" set NOT NULL;
+ALTER TABLE primitems alter column "creatorID" set DEFAULT '00000000-0000-0000-0000-000000000000' ;
+ALTER TABLE primitems ALTER COLUMN "creatorID" set NOT NULL;
+COMMIT;
+:VERSION 34               #--------------- Telehub support
+BEGIN TRANSACTION;
+CREATE TABLE spawn_points(
+        "RegionUUID" uuid NOT NULL PRIMARY KEY,
+        "Yaw" double precision NOT NULL,
+        "Pitch" double precision NOT NULL,
+        "Distance" double precision NOT NULL
+);
+ALTER TABLE regionsettings ADD "TelehubObject" uuid NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;
+:VERSION 35       #---------------- Parcels for sale
+BEGIN TRANSACTION;
+ALTER TABLE regionsettings ADD "parcel_tile_ID" uuid NOT NULL  DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;
+:VERSION 36       #---------------- Timed bans/access
+BEGIN TRANSACTION;
+ALTER TABLE landaccesslist ADD "Expires" integer NOT NULL  DEFAULT 0;
+COMMIT;
+:VERSION 37       #---------------- Environment Settings
+BEGIN TRANSACTION;
+CREATE TABLE regionenvironment(
+        "region_id" uuid NOT NULL primary key,
+        "llsd_settings" varchar  NOT NULL
+);
+COMMIT;
+:VERSION 38       #---------------- Dynamic attributes
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "DynAttrs" TEXT;
+COMMIT;
+:VERSION 39       #---------------- Extra physics params
+BEGIN TRANSACTION;
+ALTER TABLE prims ADD "PhysicsShapeType" smallint NOT NULL default '0';
+ALTER TABLE prims ADD "Density" double precision NOT NULL default '1000';
+ALTER TABLE prims ADD "GravityModifier" double precision NOT NULL default '1';
+ALTER TABLE prims ADD "Friction" double precision NOT NULL default '0.6';
+ALTER TABLE prims ADD "Restitution" double precision NOT NULL default '0.5';
+COMMIT;
+:VERSION 40      #-- regionwindlight changed type from smallint to bool
+BEGIN TRANSACTION;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_x_lock DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER cloud_scroll_x_lock TYPE bool USING CASE WHEN cloud_scroll_x_lock=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_x_lock SET DEFAULT FALSE;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_y_lock DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER cloud_scroll_y_lock TYPE bool USING CASE WHEN cloud_scroll_y_lock=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN cloud_scroll_y_lock SET DEFAULT FALSE;
+ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds DROP DEFAULT;
+ALTER TABLE regionwindlight ALTER draw_classic_clouds TYPE bool USING CASE WHEN draw_classic_clouds=0 THEN FALSE ELSE TRUE END;
+ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds SET DEFAULT FALSE;
+COMMIT;
+VERSION 41       #-- Change Landlags to bigint
+BEGIN TRANSACTION;
+ALTER TABLE land ALTER "LandFlags" TYPE bigint;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/UserAccount.migrations b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
new file mode 100644
index 0000000..c785463
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
@@ -0,0 +1,51 @@
+:VERSION 1
+CREATE TABLE UserAccounts (
+  "PrincipalID" uuid NOT NULL Primary key,
+  "ScopeID" uuid NOT NULL,
+  "FirstName" varchar(64) NOT NULL,
+  "LastName" varchar(64) NOT NULL,
+  "Email" varchar(64) NULL,
+  "ServiceURLs" text NULL,
+  "Created" int default NULL
+);
+:VERSION 2
+BEGIN TRANSACTION;
+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;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
new file mode 100644
index 0000000..a6bd8ca
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -0,0 +1,155 @@
+:VERSION 1         # -------------------------------
+begin;
+CREATE TABLE classifieds (
+  "classifieduuid" char(36) NOT NULL,
+  "creatoruuid" char(36) NOT NULL,
+  "creationdate" integer NOT NULL,
+  "expirationdate" integer NOT NULL,
+  "category" varchar(20) NOT NULL,
+  "name" varchar(255) NOT NULL,
+  "description" text NOT NULL,
+  "parceluuid" char(36) NOT NULL,
+  "parentestate" integer NOT NULL,
+  "snapshotuuid" char(36) NOT NULL,
+  "simname" varchar(255) NOT NULL,
+  "posglobal" varchar(255) NOT NULL,
+  "parcelname" varchar(255) NOT NULL,
+  "classifiedflags" integer NOT NULL,
+  "priceforlisting" integer NOT NULL,
+  constraint classifiedspk PRIMARY KEY ("classifieduuid")
+);
+CREATE TABLE usernotes (
+  "useruuid" varchar(36) NOT NULL,
+  "targetuuid" varchar(36) NOT NULL,
+  "notes" text NOT NULL,
+  constraint usernoteuk UNIQUE ("useruuid","targetuuid")
+);
+CREATE TABLE userpicks (
+  "pickuuid" varchar(36) NOT NULL,
+  "creatoruuid" varchar(36) NOT NULL,
+  "toppick" boolean NOT NULL,
+  "parceluuid" varchar(36) NOT NULL,
+  "name" varchar(255) NOT NULL,
+  "description" text NOT NULL,
+  "snapshotuuid" varchar(36) NOT NULL,
+  "user" varchar(255) NOT NULL,
+  "originalname" varchar(255) NOT NULL,
+  "simname" varchar(255) NOT NULL,
+  "posglobal" varchar(255) NOT NULL,
+  "sortorder" integer NOT NULL,
+  "enabled" boolean NOT NULL,
+  PRIMARY KEY ("pickuuid")
+);
+CREATE TABLE userprofile (
+  "useruuid" varchar(36) NOT NULL,
+  "profilePartner" varchar(36) NOT NULL,
+  "profileAllowPublish" bytea NOT NULL,
+  "profileMaturePublish" bytea NOT NULL,
+  "profileURL" varchar(255) NOT NULL,
+  "profileWantToMask" integer NOT NULL,
+  "profileWantToText" text NOT NULL,
+  "profileSkillsMask" integer NOT NULL,
+  "profileSkillsText" text NOT NULL,
+  "profileLanguages" text NOT NULL,
+  "profileImage" varchar(36) NOT NULL,
+  "profileAboutText" text NOT NULL,
+  "profileFirstImage" varchar(36) NOT NULL,
+  "profileFirstText" text NOT NULL,
+  PRIMARY KEY ("useruuid")
+);
+commit;
+:VERSION 2         # -------------------------------
+ 
+begin;
+CREATE TABLE userdata (
+    "UserId" char(36) NOT NULL,
+    "TagId" varchar(64) NOT NULL,
+    "DataKey" varchar(255),
+    "DataVal" varchar(255),
+    PRIMARY KEY ("UserId","TagId")
+);
+commit;
+:VERSION 3        # -------------------------------
+begin;
+CREATE TABLE usersettings (
+    "useruuid" char(36) NOT NULL,
+    "imviaemail" bytea NOT NULL,
+    "visible" bytea NOT NULL,
+    PRIMARY KEY ("useruuid")
+);
+commit;
+:VERSION 4
+BEGIN;
+-- Classifieds
+ALTER TABLE classifieds DROP CONSTRAINT classifiedspk;
+ALTER TABLE classifieds ALTER COLUMN classifieduuid SET DATA TYPE uuid using classifieduuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN creatoruuid SET DATA TYPE uuid using creatoruuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN parceluuid SET DATA TYPE uuid using parceluuid::uuid;
+ALTER TABLE classifieds ALTER COLUMN snapshotuuid SET DATA TYPE uuid using snapshotuuid::uuid;
+ALTER TABLE classifieds ADD CONSTRAINT classifiedspk PRIMARY KEY (classifieduuid);
+-- Notes
+ALTER TABLE usernotes DROP CONSTRAINT usernoteuk;
+ALTER TABLE usernotes ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usernotes ALTER COLUMN targetuuid SET DATA TYPE uuid USING targetuuid::uuid;
+ALTER TABLE usernotes ADD CONSTRAINT usernoteuk UNIQUE (useruuid,targetuuid);
+-- Userpicks
+ALTER TABLE userpicks DROP CONSTRAINT userpicks_pkey;
+ALTER TABLE userpicks ALTER COLUMN pickuuid SET DATA TYPE uuid USING pickuuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN creatoruuid SET DATA TYPE uuid USING creatoruuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ALTER COLUMN parceluuid SET DATA TYPE uuid USING parceluuid::uuid;
+ALTER TABLE userpicks ADD PRIMARY KEY (pickuuid);
+-- Userprofile
+ALTER TABLE userprofile DROP CONSTRAINT userprofile_pkey;
+ALTER TABLE userprofile ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profilePartner" SET DATA TYPE uuid USING "profilePartner"::uuid;
+-- Force column conversions
+ALTER TABLE userprofile ALTER COLUMN "profileAllowPublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileMaturePublish" SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE userprofile ALTER COLUMN "profileImage" SET DATA TYPE uuid USING "profileImage"::uuid;
+ALTER TABLE userprofile ALTER COLUMN "profileFirstImage" SET DATA TYPE uuid USING "profileFirstImage"::uuid;
+ALTER TABLE userprofile ADD PRIMARY KEY (useruuid);
+-- Userdata
+ALTER TABLE userdata DROP CONSTRAINT userdata_pkey;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ALTER COLUMN "UserId" SET DATA TYPE uuid USING "UserId"::uuid;
+ALTER TABLE userdata ADD PRIMARY KEY ("UserId","TagId");
+-- Usersettings
+ALTER TABLE usersettings DROP CONSTRAINT usersettings_pkey;
+ALTER TABLE usersettings ALTER COLUMN useruuid SET DATA TYPE uuid USING useruuid::uuid;
+ALTER TABLE usersettings ALTER COLUMN visible SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+ALTER TABLE usersettings ADD COLUMN email varchar(254) NOT NULL;
+ALTER TABLE usersettings ADD PRIMARY KEY (useruuid);
+COMMIT;
+:VERSION 5         # -------------------------------
+BEGIN;
+ALTER TABLE usersettings ALTER COLUMN imviaemail SET DATA TYPE boolean USING CASE WHEN false THEN false ELSE true END;
+COMMIT;
+\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/UserStore.migrations b/OpenSim/Data/PGSQL/Resources/UserStore.migrations
new file mode 100644
index 0000000..974d489
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/UserStore.migrations
@@ -0,0 +1,404 @@
+:VERSION 1
+CREATE TABLE users (
+  "UUID" varchar(36) NOT NULL default '' Primary Key,
+  "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
+);
+CREATE INDEX "usernames" ON users
+(
+        "username" ASC,
+        "lastname" ASC
+);
+CREATE TABLE agents (
+  "UUID" varchar(36) NOT NULL Primary Key,
+  "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
+);
+CREATE INDEX session ON agents
+(
+        "sessionID" ASC
+);
+CREATE INDEX ssession ON agents
+(
+        "secureSessionID" ASC
+);
+CREATE TABLE userfriends(
+        "ownerID" varchar(50) NOT NULL,
+        "friendID" varchar(50) NOT NULL,
+        "friendPerms" varchar(50)  NOT NULL,
+        "datetimestamp" varchar(50)  NOT NULL
+);
+CREATE TABLE avatarappearance  (
+  "Owner"  varchar(36) NOT NULL primary key,
+  "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
+);
+: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 INDEX IX_avatarattachments ON avatarattachments
+        (
+        "UUID"
+        );
+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
+        );
+INSERT INTO Tmp_userfriends ("ownerID", "friendID", "friendPerms", "datetimestamp")
+ SELECT cast("ownerID" as varchar(36)), cast("friendID" as varchar(36)), cast("friendPerms" as int), cast("datetimestamp" as int) 
+ FROM userfriends;
+DROP TABLE userfriends;
+alter table Tmp_userfriends rename to userfriends;
+CREATE INDEX IX_userfriends_ownerID ON userfriends
+        (
+        "ownerID"
+        );
+CREATE INDEX IX_userfriends_friendID ON userfriends
+        (
+        "friendID"
+        );
+COMMIT;
+:VERSION 5
+BEGIN TRANSACTION;
+ ALTER TABLE users add "email" varchar(250);
+ 
+COMMIT;
+:VERSION 6
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_users
+        (
+        "UUID" uuid 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 NULL DEFAULT (NULL),
+        "homeLocationY" double precision NULL DEFAULT (NULL),
+        "homeLocationZ" double precision NULL DEFAULT (NULL),
+        "homeLookAtX" double precision NULL DEFAULT (NULL),
+        "homeLookAtY" double precision NULL DEFAULT (NULL),
+        "homeLookAtZ" double precision 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" uuid NULL DEFAULT (NULL),
+        "profileFirstImage" uuid NULL DEFAULT (NULL),
+        "webLoginKey" uuid NULL DEFAULT (NULL),
+        "homeRegionID" uuid 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" uuid NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        email varchar(250) NULL
+        );
+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 cast("UUID" as uuid), "username", "lastname", "passwordHash", "passwordSalt", "homeRegion", "homeLocationX", "homeLocationY", "homeLocationZ", "homeLookAtX", "homeLookAtY", "homeLookAtZ", "created", "lastLogin", "userInventoryURI", "userAssetURI", "profileCanDoMask", "profileWantDoMask", "profileAboutText", "profileFirstText", cast("profileImage" as uuid), cast("profileFirstImage" as uuid), cast("webLoginKey" as uuid), cast("homeRegionID" as uuid), "userFlags", "godLevel", "customType", cast("partner" as uuid), email 
+        FROM users ;
+DROP TABLE users;
+alter table Tmp_users rename to users;
+ALTER TABLE users ADD CONSTRAINT
+        PK__users__65A475E737A5467C PRIMARY KEY 
+        (
+        "UUID"
+        );
+CREATE INDEX "usernames" ON users
+        (
+        "username",
+        "lastname"
+        );
+COMMIT;
+:VERSION 7
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_agents
+        (
+        "UUID" uuid NOT NULL,
+        "sessionID" uuid NOT NULL,
+        "secureSessionID" uuid NOT NULL,
+        "agentIP" varchar(16) NOT NULL,
+        "agentPort" int NOT NULL,
+        "agentOnline" smallint NOT NULL,
+        "loginTime" int NOT NULL,
+        "logoutTime" int NOT NULL,
+        "currentRegion" uuid NOT NULL,
+        "currentHandle" bigint NOT NULL,
+        "currentPos" varchar(64) NOT NULL
+        );
+INSERT INTO Tmp_agents ("UUID", "sessionID", "secureSessionID", "agentIP", "agentPort", "agentOnline", "loginTime", "logoutTime", "currentRegion", "currentHandle", "currentPos")
+        SELECT cast("UUID" as uuid), cast("sessionID" as uuid), cast("secureSessionID" as uuid), "agentIP", "agentPort", "agentOnline", "loginTime", "logoutTime", cast("currentRegion" as uuid), "currentHandle", "currentPos" 
+        FROM agents ;
+DROP TABLE agents;
+alter table Tmp_agents rename to agents;
+ALTER TABLE agents ADD CONSTRAINT
+        PK__agents__65A475E749C3F6B7 PRIMARY KEY 
+        (
+        "UUID"
+        ) ;
+CREATE INDEX session ON agents
+        (
+        "sessionID"
+        );
+CREATE INDEX ssession ON agents
+        (
+        "secureSessionID"
+        );
+COMMIT;
+:VERSION 8
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_userfriends
+        (
+        "ownerID" uuid NOT NULL,
+        "friendID" uuid NOT NULL,
+        "friendPerms" int NOT NULL,
+        "datetimestamp" int NOT NULL
+        );
+INSERT INTO Tmp_userfriends ("ownerID", "friendID", "friendPerms", "datetimestamp")
+                SELECT cast("ownerID" as uuid), cast( "friendID" as uuid), "friendPerms", "datetimestamp" 
+                FROM userfriends;
+DROP TABLE userfriends;
+alter table Tmp_userfriends rename to userfriends;
+CREATE INDEX IX_userfriends_ownerID ON userfriends
+        (
+        "ownerID"
+        );
+CREATE INDEX IX_userfriends_friendID ON userfriends
+        (
+        "friendID"
+        );
+COMMIT;
+:VERSION 9
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_avatarappearance
+        (
+        "Owner" uuid NOT NULL,
+        "Serial" int NOT NULL,
+        "Visual_Params" bytea NOT NULL,
+        "Texture" bytea NOT NULL,
+        "Avatar_Height" double precision NOT NULL,
+        "Body_Item" uuid NOT NULL,
+        "Body_Asset" uuid NOT NULL,
+        "Skin_Item" uuid NOT NULL,
+        "Skin_Asset" uuid NOT NULL,
+        "Hair_Item" uuid NOT NULL,
+        "Hair_Asset" uuid NOT NULL,
+        "Eyes_Item" uuid NOT NULL,
+        "Eyes_Asset" uuid NOT NULL,
+        "Shirt_Item" uuid NOT NULL,
+        "Shirt_Asset" uuid NOT NULL,
+        "Pants_Item" uuid NOT NULL,
+        "Pants_Asset" uuid NOT NULL,
+        "Shoes_Item" uuid NOT NULL,
+        "Shoes_Asset" uuid NOT NULL,
+        "Socks_Item" uuid NOT NULL,
+        "Socks_Asset" uuid NOT NULL,
+        "Jacket_Item" uuid NOT NULL,
+        "Jacket_Asset" uuid NOT NULL,
+        "Gloves_Item" uuid NOT NULL,
+        "Gloves_Asset" uuid NOT NULL,
+        "Undershirt_Item" uuid NOT NULL,
+        "Undershirt_Asset" uuid NOT NULL,
+        "Underpants_Item" uuid NOT NULL,
+        "Underpants_Asset" uuid NOT NULL,
+        "Skirt_Item" uuid NOT NULL,
+        "Skirt_Asset" uuid NOT NULL
+        );
+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 cast("Owner" as uuid), "Serial", "Visual_Params", "Texture", "Avatar_Height", cast("Body_Item" as uuid), cast("Body_Asset" as uuid), cast("Skin_Item" as uuid), cast("Skin_Asset" as uuid), cast("Hair_Item" as uuid), cast("Hair_Asset" as uuid), cast("Eyes_Item" as uuid), cast("Eyes_Asset" as uuid), cast("Shirt_Item" as uuid), cast("Shirt_Asset" as uuid), cast("Pants_Item" as uuid), cast("Pants_Asset" as uuid), cast("Shoes_Item" as uuid), cast("Shoes_Asset" as uuid), cast("Socks_Item" as uuid), cast("Socks_Asset" as uuid), cast("Jacket_Item" as uuid), cast("Jacket_Asset" as uuid), cast("Gloves_Item" as uuid), cast("Gloves_Asset" as uuid), cast("Undershirt_Item" as uuid), cast("Undershirt_Asset" as uuid), cast("Underpants_Item" as uuid), cast("Underpants_Asset" as uuid), cast("Skirt_Item" as uuid), cast("Skirt_Asset" as uuid) 
+        FROM avatarappearance ;
+DROP TABLE avatarappearance;
+alter table Tmp_avatarappearance rename to avatarappearance;
+ALTER TABLE avatarappearance ADD CONSTRAINT
+        PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY 
+        (
+        "Owner"
+        );
+COMMIT;
+:VERSION 10
+BEGIN TRANSACTION;
+CREATE TABLE Tmp_avatarattachments
+        (
+        "UUID" uuid NOT NULL,
+        "attachpoint" int NOT NULL,
+        item uuid NOT NULL,
+        asset uuid NOT NULL
+        );
+INSERT INTO Tmp_avatarattachments ("UUID", "attachpoint", item, asset)
+        SELECT cast("UUID" as uuid), "attachpoint", cast(item as uuid), cast(asset as uuid) 
+        FROM avatarattachments ;
+DROP TABLE avatarattachments;
+alter table Tmp_avatarattachments rename to avatarattachments;
+CREATE INDEX IX_avatarattachments ON avatarattachments
+        (
+        "UUID"
+        );
+COMMIT;
+:VERSION 11
+BEGIN TRANSACTION;
+ALTER TABLE users ADD "scopeID" uuid not null default '00000000-0000-0000-0000-000000000000';
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
new file mode 100644
index 0000000..df9d821
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
@@ -0,0 +1,80 @@
+# -----------------
+:VERSION 1
+BEGIN;
+CREATE TABLE XAssetsMeta (
+  "ID" char(36) NOT NULL,
+  "Hash" char(32) NOT NULL,
+  "Name" varchar(64) NOT NULL,
+  "Description" varchar(64) NOT NULL,
+  "AssetType" smallint NOT NULL,
+  "Local" smallint NOT NULL,
+  "Temporary" smallint NOT NULL,
+  "CreateTime" integer NOT NULL,
+  "AccessTime" integer NOT NULL,
+  "AssetFlags" integer NOT NULL,
+  "CreatorID" varchar(128) NOT NULL,
+  PRIMARY KEY ("ID")
+);
+CREATE TABLE XAssetsData (
+  "Hash" char(32) NOT NULL,
+  "Data" bytea NOT NULL,
+  PRIMARY KEY ("Hash")
+);
+COMMIT;
+:VERSION 2
+BEGIN;
+ALTER TABLE xassetsmeta ALTER COLUMN "Local" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Temporary" SET DATA TYPE boolean USING CASE WHEN '0' THEN FALSE ELSE TRUE END;
+ALTER TABLE xassetsmeta ALTER COLUMN "Hash" SET DATA TYPE char(66);
+ALTER TABLE xassetsdata ALTER COLUMN "Hash" SET DATA TYPE char(66);
+COMMIT;
+:VERSION 3
+BEGIN;
+ALTER TABLE xassetsmeta RENAME COLUMN "ID" TO id;
+ALTER TABLE xassetsmeta RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsmeta RENAME COLUMN "Name" TO name;
+ALTER TABLE xassetsmeta RENAME COLUMN "Description" TO description;
+ALTER TABLE xassetsmeta RENAME COLUMN "Local" to local;
+ALTER TABLE xassetsmeta RENAME COLUMN "Temporary" TO temporary;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreateTime" TO create_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AccessTime" TO access_time;
+ALTER TABLE xassetsmeta RENAME COLUMN "AssetFlags" TO asset_flags;
+ALTER TABLE xassetsmeta RENAME COLUMN "CreatorID" TO creatorid;
+ALTER TABLE xassetsmeta DROP CONSTRAINT xassetsmeta_pkey;
+ALTER TABLE xassetsmeta ADD PRIMARY KEY (id);
+ALTER TABLE xassetsdata RENAME COLUMN "Hash" TO hash;
+ALTER TABLE xassetsdata RENAME COLUMN "Data" TO data;
+ALTER TABLE xassetsdata DROP CONSTRAINT xassetsdata_pkey;
+ALTER TABLE xassetsdata ADD PRIMARY KEY (hash);
+COMMIT;
+:VERSION 4
+BEGIN;
+ALTER TABLE xassetsmeta ALTER COLUMN id SET DATA TYPE uuid USING id::uuid;
+ALTER TABLE xassetsmeta ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+ALTER TABLE xassetsdata ALTER COLUMN hash SET DATA TYPE bytea USING hash::bytea;
+COMMIT;
+:VERSION 5
+BEGIN;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
new file mode 100644
index 0000000..74b07c3
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/os_groups_Store.migrations
@@ -0,0 +1,211 @@
+:VERSION 1         # -------------------------- 
+BEGIN;
+CREATE TABLE os_groups_groups (
+  "GroupID" char(36) Primary Key NOT NULL default '',
+  "Location" varchar(255) NOT NULL default '',
+  "Name" varchar(255) NOT NULL default '',
+  "Charter" text NOT NULL,
+  "InsigniaID" char(36) NOT NULL default '',
+  "FounderID" char(36) NOT NULL default '',
+  "MembershipFee" integer NOT NULL default '0',
+  "OpenEnrollment" varchar(255) NOT NULL default '',
+  "ShowInList" integer NOT NULL default '0',
+  "AllowPublish" integer NOT NULL default '0',
+  "MaturePublish" integer NOT NULL default '0',
+  "OwnerRoleID" char(36) NOT NULL default ''
+);
+CREATE TABLE os_groups_membership (
+  "GroupID"char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "SelectedRoleID" char(36) NOT NULL default '',
+  "Contribution" integer NOT NULL default '0',
+  "ListInProfile" integer NOT NULL default '1',
+  "AcceptNotices" integer NOT NULL default '1',
+  "AccessToken" char(36) NOT NULL default '',
+  constraint os_groupmemberpk primary key ("GroupID", "PrincipalID")
+);
+CREATE TABLE os_groups_roles (
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "Name" varchar(255) NOT NULL default '',
+  "Description" varchar(255) NOT NULL default '',
+  "Title" varchar(255) NOT NULL default '',
+  "Powers" bigint NOT NULL default 0,
+  constraint os_grouprolepk PRIMARY KEY  ("GroupID","RoleID")
+);
+CREATE TABLE os_groups_rolemembership (
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  constraint os_grouprolememberpk PRIMARY KEY  ("GroupID","RoleID","PrincipalID")
+);
+CREATE TABLE os_groups_invites (
+  "InviteID" char(36) NOT NULL default '',
+  "GroupID" char(36) NOT NULL default '',
+  "RoleID" char(36) NOT NULL default '',
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "TMStamp" timestamp NOT NULL default now(),
+  constraint os_groupinvitespk PRIMARY KEY  ("InviteID")
+);
+--  UNIQUE KEY "PrincipalGroup" ("GroupID","PrincipalID")
+CREATE TABLE os_groups_notices (
+  "GroupID" char(36) NOT NULL default '',
+  "NoticeID" char(36) NOT NULL default '',
+  "TMStamp" integer NOT NULL default '0',
+  "FromName" varchar(255) NOT NULL default '',
+  "Subject" varchar(255) NOT NULL default '',
+  "Message" text NOT NULL,
+  "HasAttachment" integer NOT NULL default '0',
+  "AttachmentType" integer NOT NULL default '0',
+  "AttachmentName" varchar(128) NOT NULL default '',
+  "AttachmentItemID" char(36) NOT NULL default '',
+  "AttachmentOwnerID" varchar(255) NOT NULL default '',
+  constraint os_groupsnoticespk PRIMARY KEY  ("NoticeID")
+);
+--  KEY  "GroupID" ("GroupID"),
+--  KEY "TMStamp" ("TMStamp")
+CREATE TABLE os_groups_principals (
+  "PrincipalID" VARCHAR(255) NOT NULL default '',
+  "ActiveGroupID" char(36) NOT NULL default '',
+  constraint os_groupprincpk PRIMARY KEY  ("PrincipalID")
+);
+COMMIT;
+:VERSION 2         # -------------------------- 
+BEGIN;
+COMMIT;
+:VERSION 3
+BEGIN;
+-- Not a pretty way to do this, but it did not work as-is
+-- and nothing was found about converting between existing data
+-- and the new type.
+-- Since there should be nothing to preserve ...
+DROP TABLE IF EXISTS os_groups_groups CASCADE;
+CREATE TABLE os_groups_groups (
+  "GroupID" uuid PRIMARY KEY NOT NULL,
+  "Location" varchar(255) NOT NULL DEFAULT '',
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Charter" text NOT NULL,
+  "InsigniaID" uuid NOT NULL,
+  "FounderID" uuid NOT NULL,
+  "MembershipFee" integer NOT NULL DEFAULT '0',
+  "OpenEnrollment" varchar(255) NOT NULL DEFAULT '',
+  "ShowInList" integer NOT NULL DEFAULT '0',
+  "AllowPublish" integer NOT NULL DEFAULT '0',
+  "MaturePublish" integer NOT NULL DEFAULT '0',
+  "OwnerRoleID" uuid NOT NULL
+);
+DROP TABLE IF EXISTS os_groups_membership;
+CREATE TABLE os_groups_membership (
+  "GroupID"uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "SelectedRoleID" uuid NOT NULL,
+  "Contribution" integer NOT NULL DEFAULT '0',
+  "ListInProfile" integer NOT NULL DEFAULT '1',
+  "AcceptNotices" integer NOT NULL DEFAULT '1',
+  "AccessToken" uuid NOT NULL,
+  constraint os_groupmemberpk PRIMARY KEY ("GroupID", "PrincipalID")
+);
+DROP TABLE IF EXISTS os_groups_roles;
+CREATE TABLE os_groups_roles (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "Name" varchar(255) NOT NULL DEFAULT '',
+  "Description" varchar(255) NOT NULL DEFAULT '',
+  "Title" varchar(255) NOT NULL DEFAULT '',
+  "Powers" varchar(36) NOT NULL DEFAULT '',
+  constraint os_grouprolepk PRIMARY KEY  ("GroupID","RoleID")
+);
+DROP TABLE IF EXISTS os_groups_rolemembership;
+CREATE TABLE os_groups_rolemembership (
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  constraint os_grouprolememberpk PRIMARY KEY  ("GroupID","RoleID","PrincipalID")
+);
+DROP TABLE IF EXISTS os_groups_invites;
+CREATE TABLE os_groups_invites (
+  "InviteID" uuid NOT NULL,
+  "GroupID" uuid NOT NULL,
+  "RoleID" uuid NOT NULL,
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "TMStamp" timestamp NOT NULL DEFAULT now(),
+  constraint os_groupinvitespk PRIMARY KEY  ("InviteID")
+);
+DROP TABLE IF EXISTS os_groups_notices;
+CREATE TABLE os_groups_notices (
+  "GroupID" uuid NOT NULL,
+  "NoticeID" uuid NOT NULL,
+  "TMStamp" integer NOT NULL DEFAULT '0',
+  "FromName" varchar(255) NOT NULL DEFAULT '',
+  "Subject" varchar(255) NOT NULL DEFAULT '',
+  "Message" text NOT NULL,
+  "HasAttachment" integer NOT NULL DEFAULT '0',
+  "AttachmentType" integer NOT NULL DEFAULT '0',
+  "AttachmentName" varchar(128) NOT NULL DEFAULT '',
+  "AttachmentItemID" uuid NOT NULL,
+  "AttachmentOwnerID" varchar(255) NOT NULL DEFAULT '',
+  constraint os_groupsnoticespk PRIMARY KEY  ("NoticeID")
+);
+DROP TABLE IF EXISTS os_groups_principals;
+CREATE TABLE os_groups_principals (
+  "PrincipalID" VARCHAR(255) NOT NULL DEFAULT '',
+  "ActiveGroupID" uuid NOT NULL,
+  constraint os_groupprincpk PRIMARY KEY  ("PrincipalID")
+);
+COMMIT;
+:VERSION 4
+BEGIN;
+ALTER TABLE IF EXISTS os_groups_notices  
+  ALTER COLUMN "AttachmentItemID" SET DEFAULT '00000000-0000-0000-0000-000000000000'
+;
+COMMIT;