125 files changed, 3885 insertions, 5111 deletions

diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 1bb432c..9593a25 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Data
     public abstract class AssetDataBase : IAssetDataPlugin
     {
         public abstract AssetBase GetAsset(UUID uuid);
-        public abstract void StoreAsset(AssetBase asset);
+        public abstract bool StoreAsset(AssetBase asset);
         public abstract bool[] AssetsExist(UUID[] uuids);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
diff --git a/OpenSim/Data/DBGuids.cs b/OpenSim/Data/DBGuids.cs
index ad1c19c..1a2bf41 100644
--- a/OpenSim/Data/DBGuids.cs
+++ b/OpenSim/Data/DBGuids.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Data
         /// <summary>This function converts a value returned from the database in one of the
         /// supported formats into a UUID.  This function is not actually DBMS-specific right
         /// now
-        /// 
+        ///
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index a41e310..febab5d 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Data
     public interface IAssetDataPlugin : IPlugin
     {
         AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
+        bool StoreAsset(AssetBase asset);
         bool[] AssetsExist(UUID[] uuids);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);
diff --git a/OpenSim/Data/IAvatarData.cs b/OpenSim/Data/IAvatarData.cs
index 0a18e21..b3f12c1 100644
--- a/OpenSim/Data/IAvatarData.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data
         public Dictionary<string, string> Data;
     }
 
-    public interface IAvatarData 
+    public interface IAvatarData
     {
         AvatarBaseData[] Get(string field, string val);
         bool Store(AvatarBaseData data);
diff --git a/OpenSim/Data/IEstateDataStore.cs b/OpenSim/Data/IEstateDataStore.cs
index f9070ea..6b30db2 100644
--- a/OpenSim/Data/IEstateDataStore.cs
+++ b/OpenSim/Data/IEstateDataStore.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Data
         /// <param name="create">If true, then an estate is created if one is not found.</param>
         /// <returns></returns>
         EstateSettings LoadEstateSettings(UUID regionID, bool create);
-        
+
         /// <summary>
         /// Load estate settings for an estate ID.
         /// </summary>
         /// <param name="estateID"></param>
         /// <returns></returns>
         EstateSettings LoadEstateSettings(int estateID);
-        
+
         /// <summary>
         /// Create a new estate.
         /// </summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Data
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<EstateSettings> LoadEstateSettingsAll();
-        
+
         /// <summary>
         /// Store estate settings.
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Data
         /// This is also called by EstateSettings.Save()</remarks>
         /// <param name="es"></param>
         void StoreEstateSettings(EstateSettings es);
-        
+
         /// <summary>
         /// Get estate IDs.
         /// </summary>
@@ -88,13 +88,13 @@ namespace OpenSim.Data
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesByOwner(UUID ownerID);
-        
+
         /// <summary>
         /// Get the IDs of all estates.
         /// </summary>
         /// <returns>An empty list if no estates were found.</returns>
         List<int> GetEstatesAll();
-        
+
         /// <summary>
         /// Link a region to an estate.
         /// </summary>
@@ -102,14 +102,14 @@ namespace OpenSim.Data
         /// <param name="estateID"></param>
         /// <returns>true if the link succeeded, false otherwise</returns>
         bool LinkRegion(UUID regionID, int estateID);
-        
+
         /// <summary>
         /// Get the UUIDs of all the regions in an estate.
         /// </summary>
         /// <param name="estateID"></param>
         /// <returns></returns>
         List<UUID> GetRegions(int estateID);
-        
+
         /// <summary>
         /// Delete an estate
         /// </summary>
diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index 9afa477..1b2ea87 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the user grid datastore
     /// </summary>
-    public interface IGridUserData 
+    public interface IGridUserData
     {
         GridUserData Get(string userID);
         GridUserData[] GetAll(string query);
diff --git a/OpenSim/Data/IGroupsData.cs b/OpenSim/Data/IGroupsData.cs
index c11e649..bd059e0 100644
--- a/OpenSim/Data/IGroupsData.cs
+++ b/OpenSim/Data/IGroupsData.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Data
     }
 
 
-    public interface IGroupsData 
+    public interface IGroupsData
     {
         // groups table
         bool StoreGroup(GroupData data);
diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
index 452af7b..5e4894e 100644
--- a/OpenSim/Data/IHGTravelingData.cs
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the user grid datastore
     /// </summary>
-    public interface IHGTravelingData 
+    public interface IHGTravelingData
     {
         HGTravelingData Get(UUID sessionID);
         HGTravelingData[] GetSessions(UUID userID);
diff --git a/OpenSim/Data/IMuteListData.cs b/OpenSim/Data/IMuteListData.cs
new file mode 100644
index 0000000..b0235b2
--- /dev/null
+++ b/OpenSim/Data/IMuteListData.cs
@@ -0,0 +1,44 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data
+{
+     /// <summary>
+    /// An interface for connecting to the Mute List datastore
+    /// </summary>
+    public interface IMuteListData
+    {
+        bool Store(MuteData data);
+        MuteData[] Get(UUID agentID);
+        bool Delete(UUID agentID, UUID muteID, string muteName);
+    }
+}
diff --git a/OpenSim/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
index 58501a3..a0f4d69 100644
--- a/OpenSim/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data
     }
 
 
-    public interface IOfflineIMData 
+    public interface IOfflineIMData
     {
         OfflineIMData[] Get(string field, string val);
         long GetCount(string field, string key);
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index 9ec48b0..4086245 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the presence datastore
     /// </summary>
-    public interface IPresenceData 
+    public interface IPresenceData
     {
         bool Store(PresenceData data);
 
diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index 7fb075d..a4a32a9 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Data
         bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
         bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
         bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
-        bool UpdateUserPreferences(ref UserPreferences pref,  ref string result);
+        bool UpdateUserPreferences(ref UserPreferences pref, ref string result);
         bool GetUserPreferences(ref UserPreferences pref, ref string result);
         bool GetUserAppData(ref UserAppData props, ref string result);
         bool SetUserAppData(UserAppData props, ref string result);
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index ca9b327..c8e38a4 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Data
     /// <summary>
     /// An interface for connecting to the authentication datastore
     /// </summary>
-    public interface IRegionData 
+    public interface IRegionData
     {
         RegionData Get(UUID regionID, UUID ScopeID);
         List<RegionData> Get(string regionName, UUID ScopeID);
diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 906ba6c..bc7eda7 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -50,5 +50,6 @@ namespace OpenSim.Data
         bool Store(UserAccountData data);
         bool Delete(string field, string val);
         UserAccountData[] GetUsers(UUID scopeID, string query);
+        UserAccountData[] GetUsersWhere(UUID scopeID, string where);
     }
 }
diff --git a/OpenSim/Data/IXGroupData.cs b/OpenSim/Data/IXGroupData.cs
index e5821ef..82073fe 100644
--- a/OpenSim/Data/IXGroupData.cs
+++ b/OpenSim/Data/IXGroupData.cs
@@ -38,12 +38,12 @@ namespace OpenSim.Data
         public UUID ownerRoleID;
         public string name;
         public string charter;
-        public bool showInList; 
-        public UUID insigniaID; 
+        public bool showInList;
+        public UUID insigniaID;
         public int membershipFee;
         public bool openEnrollment;
         public bool allowPublish;
-        public bool maturePublish; 
+        public bool maturePublish;
         public UUID founderID;
         public ulong everyonePowers;
         public ulong ownersPowers;
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index d606470..e54bf55 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -80,10 +80,10 @@ namespace OpenSim.Data
 
         /// <summary>Have the parameterless constructor just so we can specify it as a generic parameter with the new() constraint.
         /// Currently this is only used in the tests. A Migration instance created this way must be then
-        /// initialized with Initialize(). Regular creation should be through the parameterized constructors. 
+        /// initialized with Initialize(). Regular creation should be through the parameterized constructors.
         /// </summary>
         public Migration()
-        { 
+        {
         }
 
         public Migration(DbConnection conn, Assembly assem, string subtype, string type)
@@ -91,7 +91,7 @@ namespace OpenSim.Data
             Initialize(conn, assem, type, subtype);
         }
 
-        public Migration(DbConnection conn, Assembly assem, string type) 
+        public Migration(DbConnection conn, Assembly assem, string type)
         {
             Initialize(conn, assem, type, "");
         }
@@ -191,7 +191,7 @@ namespace OpenSim.Data
                 int newversion = kvp.Key;
                 // we need to up the command timeout to infinite as we might be doing long migrations.
 
-                /* [AlexRa 01-May-10]: We can't always just run any SQL in a single batch (= ExecuteNonQuery()). Things like 
+                /* [AlexRa 01-May-10]: We can't always just run any SQL in a single batch (= ExecuteNonQuery()). Things like
                  * stored proc definitions might have to be sent to the server each in a separate batch.
                  * This is certainly so for MS SQL; not sure how the MySQL connector sorts out the mess
                  * with 'delimiter @@'/'delimiter ;' around procs.  So each "script" this code executes now is not
@@ -276,7 +276,7 @@ namespace OpenSim.Data
         private delegate void FlushProc();
 
         /// <summary>Scans for migration resources in either old-style "scattered" (one file per version)
-        /// or new-style "integrated" format (single file with ":VERSION nnn" sections). 
+        /// or new-style "integrated" format (single file with ":VERSION nnn" sections).
         /// In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
         /// that must be sent to the server separately.  The old-style migrations are loaded each in one piece
         /// and don't support the ':GO' feature.
@@ -301,12 +301,12 @@ namespace OpenSim.Data
             {
                 /* The filename should be '<StoreName>.migrations[.NNN]' where NNN
                  * is the last version number defined in the file. If the '.NNN' part is recognized, the code can skip
-                 * the file without looking inside if we have a higher version already. Without the suffix we read 
+                 * the file without looking inside if we have a higher version already. Without the suffix we read
                  * the file anyway and use the version numbers inside.  Any unrecognized suffix (such as '.sql')
                  * is valid but ignored.
-                 * 
-                 *  NOTE that we expect only one 'merged' migration file. If there are several, we take the last one. 
-                 *  If you are numbering them, leave only the latest one in the project or at least make sure they numbered 
+                 *
+                 *  NOTE that we expect only one 'merged' migration file. If there are several, we take the last one.
+                 *  If you are numbering them, leave only the latest one in the project or at least make sure they numbered
                  *  to come up in the correct order (e.g. 'SomeStore.migrations.001' rather than 'SomeStore.migrations.1')
                  */
 
@@ -351,7 +351,7 @@ namespace OpenSim.Data
                         if (sLine.Trim().Equals(":GO", StringComparison.InvariantCultureIgnoreCase))
                         {
                             if (sb.Length == 0) continue;
-                            if (nVersion > after) 
+                            if (nVersion > after)
                                 script.Add(sb.ToString());
                             sb.Length = 0;
                             continue;
@@ -405,10 +405,10 @@ scan_old_style:
                     }
                 }
             }
-            
-            if (migrations.Count < 1) 
+
+            if (migrations.Count < 1)
                 m_log.DebugFormat("[MIGRATIONS]: {0} data tables already up to date at revision {1}", _type, after);
-            
+
             return migrations;
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
index ed0ab98..17f1374 100644
--- a/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
+++ b/OpenSim/Data/MySQL/MySQLAgentPreferencesData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 5d8da17..8569c90 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -75,6 +75,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "AssetStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -144,6 +145,7 @@ namespace OpenSim.Data.MySQL
                             string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", assetID), e);
                     }
                 }
+                dbcon.Close();
             }
 
             return asset;
@@ -154,65 +156,62 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
+            string assetName = asset.Name;
+            if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
+            {
+                assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
+                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 > AssetBase.MAX_ASSET_DESC)
+            {
+                assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
+                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 (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-
                 using (MySqlCommand cmd =
                     new MySqlCommand(
                         "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, CreatorID, data)" +
                         "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?CreatorID, ?data)",
                         dbcon))
                 {
-                    string assetName = asset.Name;
-                    if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
-                    {
-                        assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
-                        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 > AssetBase.MAX_ASSET_DESC)
-                    {
-                        assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
-                        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);
-                    }
-
                     try
                     {
-                        using (cmd)
-                        {
-                            // create unix epoch time
-                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                            cmd.Parameters.AddWithValue("?id", asset.ID);
-                            cmd.Parameters.AddWithValue("?name", assetName);
-                            cmd.Parameters.AddWithValue("?description", assetDescription);
-                            cmd.Parameters.AddWithValue("?assetType", asset.Type);
-                            cmd.Parameters.AddWithValue("?local", asset.Local);
-                            cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
-                            cmd.Parameters.AddWithValue("?create_time", now);
-                            cmd.Parameters.AddWithValue("?access_time", now);
-                            cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
-                            cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
-                            cmd.Parameters.AddWithValue("?data", asset.Data);
-                            cmd.ExecuteNonQuery();
-                        }
+                        // create unix epoch time
+                        int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                        cmd.Parameters.AddWithValue("?id", asset.ID);
+                        cmd.Parameters.AddWithValue("?name", assetName);
+                        cmd.Parameters.AddWithValue("?description", assetDescription);
+                        cmd.Parameters.AddWithValue("?assetType", asset.Type);
+                        cmd.Parameters.AddWithValue("?local", asset.Local);
+                        cmd.Parameters.AddWithValue("?temporary", asset.Temporary);
+                        cmd.Parameters.AddWithValue("?create_time", now);
+                        cmd.Parameters.AddWithValue("?access_time", now);
+                        cmd.Parameters.AddWithValue("?CreatorID", asset.Metadata.CreatorID);
+                        cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
+                        cmd.Parameters.AddWithValue("?data", asset.Data);
+                        cmd.ExecuteNonQuery();
+                        dbcon.Close();
+                        return true;
                     }
                     catch (Exception e)
                     {
-                        m_log.Error(
-                            string.Format(
-                                "[ASSET DB]: MySQL failure creating asset {0} with name {1}.  Exception  ",
-                                asset.FullID, asset.Name)
-                            , e);
+                        m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
+                            asset.FullID, asset.Name, e.Message);
+                        dbcon.Close();
+                        return false;
                     }
-                }
+                }               
             }
         }
 
@@ -227,24 +226,22 @@ namespace OpenSim.Data.MySQL
                 {
                     try
                     {
-                        using (cmd)
-                        {
-                            // create unix epoch time
-                            int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
-                            cmd.Parameters.AddWithValue("?id", asset.ID);
-                            cmd.Parameters.AddWithValue("?access_time", now);
-                            cmd.ExecuteNonQuery();
-                        }
+                        // create unix epoch time
+                        int now = (int)Utils.DateTimeToUnixTime(DateTime.UtcNow);
+                        cmd.Parameters.AddWithValue("?id", asset.ID);
+                        cmd.Parameters.AddWithValue("?access_time", now);
+                        cmd.ExecuteNonQuery();
                     }
                     catch (Exception e)
                     {
                         m_log.Error(
                             string.Format(
-                                "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}.  Exception  ", 
-                                asset.FullID, asset.Name), 
+                                "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}.  Exception  ",
+                                asset.FullID, asset.Name),
                             e);
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -277,6 +274,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
             }
 
             bool[] results = new bool[uuids.Length];
@@ -336,11 +334,12 @@ namespace OpenSim.Data.MySQL
                     {
                         m_log.Error(
                             string.Format(
-                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ", 
-                                start, count), 
+                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ",
+                                start, count),
                             e);
                     }
                 }
+                dbcon.Close();
             }
 
             return retList;
@@ -357,6 +356,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?id", id);
                     cmd.ExecuteNonQuery();
                 }
+                dbcon.Close();
             }
 
             return true;
@@ -364,4 +364,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index 7627497..fef582e 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "AuthStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -76,27 +77,30 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
 
-                    IDataReader result = cmd.ExecuteReader();
-    
-                    if (result.Read())
+                    using(IDataReader result = cmd.ExecuteReader())
                     {
-                        ret.PrincipalID = principalID;
-    
-                        CheckColumnNames(result);
-    
-                        foreach (string s in m_ColumnNames)
+                         if(result.Read())
                         {
-                            if (s == "UUID")
-                                continue;
-    
-                            ret.Data[s] = result[s].ToString();
+                            ret.PrincipalID = principalID;
+
+                            CheckColumnNames(result);
+
+                            foreach(string s in m_ColumnNames)
+                            {
+                                if(s == "UUID")
+                                    continue;
+
+                                ret.Data[s] = result[s].ToString();
+                            }
+
+                            dbcon.Close();
+                            return ret;
+                        }
+                        else
+                        {
+                            dbcon.Close();
+                            return null;
                         }
-    
-                        return ret;
-                    }
-                    else
-                    {
-                        return null;
                     }
                 }
             }
@@ -132,25 +136,25 @@ namespace OpenSim.Data.MySQL
                     if (!first)
                         update += ", ";
                     update += "`" + field + "` = ?"+field;
-    
+
                     first = false;
-    
+
                     cmd.Parameters.AddWithValue("?"+field, data.Data[field]);
                 }
-    
+
                 update += " where UUID = ?principalID";
-    
+
                 cmd.CommandText = update;
                 cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) < 1)
                 {
                     string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
                             String.Join("`, `", fields) +
                             "`) values (?principalID, ?" + String.Join(", ?", fields) + ")";
-    
+
                     cmd.CommandText = insert;
-    
+
                     if (ExecuteNonQuery(cmd) < 1)
                         return false;
                 }
@@ -166,7 +170,7 @@ namespace OpenSim.Data.MySQL
             {
                 cmd.Parameters.AddWithValue("?"+item, value);
                 cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
@@ -186,7 +190,7 @@ namespace OpenSim.Data.MySQL
                 cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
                 cmd.Parameters.AddWithValue("?token", token);
                 cmd.Parameters.AddWithValue("?lifetime", lifetime.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
index 6a2f5d8..63e8020 100644
--- a/OpenSim/Data/MySQL/MySQLAvatarData.cs
+++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Data.MySQL
                 cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
                 cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
                 cmd.Parameters.AddWithValue("?Name", name);
-    
+
                 if (ExecuteNonQuery(cmd) > 0)
                     return true;
             }
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index fe1487b..eeedf02 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -82,6 +82,7 @@ namespace OpenSim.Data.MySQL
 
                 Migration m = new Migration(dbcon, Assembly, "EstateStore");
                 m.Update();
+                dbcon.Close();
 
                 Type t = typeof(EstateSettings);
                 m_Fields = t.GetFields(BindingFlags.NonPublic |
@@ -143,7 +144,6 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-
                 cmd.Connection = dbcon;
 
                 bool found = false;
@@ -171,6 +171,8 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
+                cmd.Connection = null;
 
                 if (!found && create)
                 {
@@ -231,6 +233,7 @@ namespace OpenSim.Data.MySQL
 
                     es.Save();
                 }
+                dbcon.Close();
             }
         }
 
@@ -263,6 +266,7 @@ namespace OpenSim.Data.MySQL
 
                     cmd.ExecuteNonQuery();
                 }
+                dbcon.Close();
             }
 
             SaveBanList(es);
@@ -300,6 +304,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -329,6 +334,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.Clear();
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -358,6 +364,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.Clear();
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -383,6 +390,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
             }
 
             return uuids.ToArray();
@@ -403,19 +411,19 @@ namespace OpenSim.Data.MySQL
                 return e;
             }
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
-            List<EstateSettings> allEstateSettings = new List<EstateSettings>();            
-            
+            List<EstateSettings> allEstateSettings = new List<EstateSettings>();
+
             List<int> allEstateIds = GetEstatesAll();
-            
+
             foreach (int estateId in allEstateIds)
                 allEstateSettings.Add(LoadEstateSettings(estateId));
-            
+
             return allEstateSettings;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
@@ -437,11 +445,10 @@ namespace OpenSim.Data.MySQL
                         reader.Close();
                     }
                 }
-
                 dbcon.Close();
             }
 
-            return result;            
+            return result;
         }
 
         public List<int> GetEstates(string search)
@@ -466,7 +473,6 @@ namespace OpenSim.Data.MySQL
                         reader.Close();
                     }
                 }
-
                 dbcon.Close();
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
index 19e23b5..6c48607 100644
--- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -41,10 +41,8 @@ namespace OpenSim.Data.MySQL
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected MySqlConnection m_Connection = null;
         protected string m_ConnectionString;
         protected string m_Table;
-        protected Object m_connLock = new Object();
 
         /// <summary>
         /// Number of days that must pass before we update the access time on an asset when it has been fetched
@@ -56,7 +54,7 @@ namespace OpenSim.Data.MySQL
         {
             get { return GetType().Assembly; }
         }
-        
+
         public MySQLFSAssetData()
         {
         }
@@ -75,10 +73,13 @@ namespace OpenSim.Data.MySQL
 
             try
             {
-                OpenDatabase();
-
-                Migration m = new Migration(m_Connection, Assembly, "FSAssetStore");
-                m.Update();
+                using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+                {
+                    conn.Open();
+                    Migration m = new Migration(conn, Assembly, "FSAssetStore");
+                    m.Update();
+                    conn.Close();
+                }
             }
             catch (MySqlException e)
             {
@@ -100,70 +101,37 @@ namespace OpenSim.Data.MySQL
 
         #endregion
 
-        private bool OpenDatabase()
+        private bool ExecuteNonQuery(MySqlCommand cmd)
         {
-            try
-            {
-                m_Connection = new MySqlConnection(m_ConnectionString);
-
-                m_Connection.Open();
-            }
-            catch (MySqlException e)
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
             {
-                m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
-                        e.Message.ToString());
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private IDataReader ExecuteReader(MySqlCommand c)
-        {
-            IDataReader r = null;
-            MySqlConnection connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
-            connection.Open();
-            c.Connection = connection;
-
-            r = c.ExecuteReader();
-
-            return r;
-        }
-
-        private void ExecuteNonQuery(MySqlCommand c)
-        {
-            lock (m_connLock)
-            {
-                bool errorSeen = false;
-
-                while (true)
+                try
                 {
-                    try
-                    {
-                        c.ExecuteNonQuery();
-                    }
-                    catch (MySqlException)
-                    {
-                        System.Threading.Thread.Sleep(500);
-
-                        m_Connection.Close();
-                        m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
-                        m_Connection.Open();
-                        c.Connection = m_Connection;
-
-                        if (!errorSeen)
-                        {
-                            errorSeen = true;
-                            continue;
-                        }
-                        m_log.ErrorFormat("[FSASSETS] MySQL command: {0}", c.CommandText);
-                        throw;
-                    }
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return false;
+                }
 
-                    break;
+                cmd.Connection = conn;
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (MySqlException e)
+                {
+                    cmd.Connection = null;
+                    conn.Close();
+                    m_log.ErrorFormat("[FSASSETS]: Query {0} failed with {1}", cmd.CommandText, e.ToString());
+                    return false;
                 }
+                conn.Close();
+                cmd.Connection = null;
             }
+
+            return true;
         }
 
         #region IFSAssetDataPlugin Members
@@ -172,63 +140,79 @@ namespace OpenSim.Data.MySQL
         {
             hash = String.Empty;
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, access_time, asset_flags from {0} where id = ?id", m_Table);
-            cmd.Parameters.AddWithValue("?id", id);
-
-            IDataReader reader = ExecuteReader(cmd);
-
-            if (!reader.Read())
-            {
-                reader.Close();
-                FreeCommand(cmd);
-                return null;
-            }
-            
             AssetMetadata meta = new AssetMetadata();
 
-            hash = reader["hash"].ToString();
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return null;
+                }
 
-            meta.ID = id;
-            meta.FullID = new UUID(id);
+                using (MySqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = String.Format("select id, name, description, type, hash, create_time, asset_flags, access_time from {0} where id = ?id", m_Table);
+                    cmd.Parameters.AddWithValue("?id", id);
 
-            meta.Name = reader["name"].ToString();
-            meta.Description = reader["description"].ToString();
-            meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
-            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
-            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
-            meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (!reader.Read())
+                            return null;
 
-            int AccessTime = Convert.ToInt32(reader["access_time"]);
+                        hash = reader["hash"].ToString();
 
-            reader.Close();
+                        meta.ID = id;
+                        meta.FullID = new UUID(id);
 
-            UpdateAccessTime(AccessTime, cmd);
+                        meta.Name = reader["name"].ToString();
+                        meta.Description = reader["description"].ToString();
+                        meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
+                        meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                        meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+                        meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
 
-            FreeCommand(cmd);
+                        int AccessTime = Convert.ToInt32(reader["access_time"]);
+                        UpdateAccessTime(id, AccessTime);
+                    }
+                }
+                conn.Close();
+            }
 
             return meta;
         }
 
-        private void UpdateAccessTime(int AccessTime, MySqlCommand cmd)
+        private void UpdateAccessTime(string AssetID, int AccessTime)
         {
             // Reduce DB work by only updating access time if asset hasn't recently been accessed
             // 0 By Default, Config option is "DaysBetweenAccessTimeUpdates"
             if (DaysBetweenAccessTimeUpdates > 0 && (DateTime.UtcNow - Utils.UnixTimeToDateTime(AccessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
                 return;
 
-            cmd.CommandText = String.Format("UPDATE {0} SET `access_time` = UNIX_TIMESTAMP() WHERE `id` = ?id", m_Table);
-
-            cmd.ExecuteNonQuery();
-        }
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Database open failed with {0}", e.ToString());
+                    return;
+                }
 
-        protected void FreeCommand(MySqlCommand cmd)
-        {
-            MySqlConnection c = cmd.Connection;
-            cmd.Dispose();
-            c.Close();
-            c.Dispose();
+                using (MySqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = String.Format("UPDATE {0} SET `access_time` = UNIX_TIMESTAMP() WHERE `id` = ?id", m_Table);
+                    cmd.Parameters.AddWithValue("?id", AssetID);
+                    cmd.ExecuteNonQuery();
+                }
+                conn.Close();
+            }
         }
 
         public bool Store(AssetMetadata meta, string hash)
@@ -238,37 +222,41 @@ namespace OpenSim.Data.MySQL
                 string oldhash;
                 AssetMetadata existingAsset = Get(meta.ID, out oldhash);
 
-                MySqlCommand cmd = m_Connection.CreateCommand();
-
-                cmd.Parameters.AddWithValue("?id", meta.ID);
-                cmd.Parameters.AddWithValue("?name", meta.Name);
-                cmd.Parameters.AddWithValue("?description", meta.Description);
-                cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
-                cmd.Parameters.AddWithValue("?hash", hash);
-                cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
-
-                if (existingAsset == null)
+                using (MySqlCommand cmd = new MySqlCommand())
                 {
-                    cmd.CommandText = String.Format("insert into {0} (id, name, description, type, hash, asset_flags, create_time, access_time) values ( ?id, ?name, ?description, ?type, ?hash, ?asset_flags, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())", m_Table);
+                    cmd.Parameters.AddWithValue("?id", meta.ID);
+                    cmd.Parameters.AddWithValue("?name", meta.Name);
+                    cmd.Parameters.AddWithValue("?description", meta.Description);
+//                    cmd.Parameters.AddWithValue("?type", meta.Type.ToString());
+                    cmd.Parameters.AddWithValue("?type", meta.Type);
+                    cmd.Parameters.AddWithValue("?hash", hash);
+                    cmd.Parameters.AddWithValue("?asset_flags", meta.Flags);
+
+                    if (existingAsset == null)
+                    {
+                        cmd.CommandText = String.Format("insert into {0} (id, name, description, type, hash, asset_flags, create_time, access_time) values ( ?id, ?name, ?description, ?type, ?hash, ?asset_flags, UNIX_TIMESTAMP(), UNIX_TIMESTAMP())", m_Table);
 
-                    ExecuteNonQuery(cmd);
+                        ExecuteNonQuery(cmd);
 
-                    cmd.Dispose();
+                        return true;
+                    }
 
-                    return true;
-                }
+                    //cmd.CommandText = String.Format("update {0} set hash = ?hash, access_time = UNIX_TIMESTAMP() where id = ?id", m_Table);
 
-                //cmd.CommandText = String.Format("update {0} set hash = ?hash, access_time = UNIX_TIMESTAMP() where id = ?id", m_Table);
+                    //ExecuteNonQuery(cmd);
 
-                //ExecuteNonQuery(cmd);
+                }
 
-                cmd.Dispose();
-                return false;
+//                return false;
+                // if the asset already exits
+                // assume it was already correctly stored
+                // or regions will keep retry.
+                return true;
             }
             catch(Exception e)
             {
                 m_log.Error("[FSAssets] Failed to store asset with ID " + meta.ID);
-                        m_log.Error(e.ToString());
+        m_log.Error(e.ToString());
                 return false;
             }
         }
@@ -283,26 +271,43 @@ namespace OpenSim.Data.MySQL
             if (uuids.Length == 0)
                 return new bool[0];
 
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = false;
+
             HashSet<UUID> exists = new HashSet<UUID>();
 
             string ids = "'" + string.Join("','", uuids) + "'";
             string sql = string.Format("select id from {1} where id in ({0})", ids, m_Table);
 
-            using (MySqlCommand cmd = m_Connection.CreateCommand())
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
             {
-                cmd.CommandText = sql;
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
+                    return results;
+                }
 
-                using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                using (MySqlCommand cmd = conn.CreateCommand())
                 {
-                    while (dbReader.Read())
+                    cmd.CommandText = sql;
+
+                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
                     {
-                        UUID id = DBGuid.FromDB(dbReader["ID"]);
-                        exists.Add(id);
+                        while (dbReader.Read())
+                        {
+                            UUID id = DBGuid.FromDB(dbReader["ID"]);
+                            exists.Add(id);
+                        }
                     }
                 }
+                conn.Close();
             }
 
-            bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
                 results[i] = exists.Contains(uuids[i]);
             return results;
@@ -310,27 +315,43 @@ namespace OpenSim.Data.MySQL
 
         public int Count()
         {
-            MySqlCommand cmd = m_Connection.CreateCommand();
+            int count = 0;
 
-            cmd.CommandText = String.Format("select count(*) as count from {0}", m_Table);
-
-            IDataReader reader = ExecuteReader(cmd);
+            using (MySqlConnection conn = new MySqlConnection(m_ConnectionString))
+            {
+                try
+                {
+                    conn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Failed to open database: {0}", e.ToString());
+                    return 0;
+                }
 
-            reader.Read();
+                using(MySqlCommand cmd = conn.CreateCommand())
+                {
+                    cmd.CommandText = String.Format("select count(*) as count from {0}",m_Table);
 
-            int count = Convert.ToInt32(reader["count"]);
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        reader.Read();
 
-            reader.Close();
-            FreeCommand(cmd);
+                        count = Convert.ToInt32(reader["count"]);
+                    }
+                }
+                conn.Close();
+            }
 
             return count;
         }
 
         public bool Delete(string id)
         {
-            using (MySqlCommand cmd = m_Connection.CreateCommand())
+            using(MySqlCommand cmd = new MySqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where id = ?id", m_Table);
+
+                cmd.CommandText = String.Format("delete from {0} where id = ?id",m_Table);
 
                 cmd.Parameters.AddWithValue("?id", id);
 
@@ -342,70 +363,68 @@ namespace OpenSim.Data.MySQL
 
         public void Import(string conn, string table, int start, int count, bool force, FSStoreDelegate store)
         {
-            MySqlConnection importConn;
-
-            try
-            {
-                importConn = new MySqlConnection(conn);
+            int imported = 0;
 
-                importConn.Open();
-            }
-            catch (MySqlException e)
+            using (MySqlConnection importConn = new MySqlConnection(conn))
             {
-                m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
-                        e.Message.ToString());
-
-                return;
-            }
+                try
+                {
+                    importConn.Open();
+                }
+                catch (MySqlException e)
+                {
+                    m_log.ErrorFormat("[FSASSETS]: Can't connect to database: {0}",
+                            e.Message.ToString());
 
-            int imported = 0;
+                    return;
+                }
 
-            MySqlCommand cmd = importConn.CreateCommand();
+                using (MySqlCommand cmd = importConn.CreateCommand())
+                {
+                    string limit = String.Empty;
+                    if (count != -1)
+                    {
+                        limit = String.Format(" limit {0},{1}", start, count);
+                    }
 
-            string limit = String.Empty;
-            if (count != -1)
-            {
-                limit = String.Format(" limit {0},{1}", start, count);
-            }
-                
-            cmd.CommandText = String.Format("select * from {0}{1}", table, limit);
+                    cmd.CommandText = String.Format("select * from {0}{1}", table, limit);
 
-            MainConsole.Instance.Output("Querying database");
-            IDataReader reader = cmd.ExecuteReader();
+                    MainConsole.Instance.Output("Querying database");
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        MainConsole.Instance.Output("Reading data");
 
-            MainConsole.Instance.Output("Reading data");
+                        while (reader.Read())
+                        {
+                            if ((imported % 100) == 0)
+                            {
+                                MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
+                            }
 
-            while (reader.Read())
-            {
-                if ((imported % 100) == 0)
-                {
-                    MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
-                }
-    
-                AssetBase asset = new AssetBase();
-                AssetMetadata meta = new AssetMetadata();
+                            AssetBase asset = new AssetBase();
+                            AssetMetadata meta = new AssetMetadata();
 
-                meta.ID = reader["id"].ToString();
-                meta.FullID = new UUID(meta.ID);
+                            meta.ID = reader["id"].ToString();
+                            meta.FullID = new UUID(meta.ID);
 
-                meta.Name = reader["name"].ToString();
-                meta.Description = reader["description"].ToString();
-                meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
-                meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
-                meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+                            meta.Name = reader["name"].ToString();
+                            meta.Description = reader["description"].ToString();
+                            meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
+                            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
 
-                asset.Metadata = meta;
-                asset.Data = (byte[])reader["data"];
+                            asset.Metadata = meta;
+                            asset.Data = (byte[])reader["data"];
 
-                store(asset, force);
+                            store(asset, force);
 
-                imported++;
+                            imported++;
+                        }
+                    }
+                }
+                importConn.Close();
             }
 
-            reader.Close();
-            cmd.Dispose();
-            importConn.Close();
-
             MainConsole.Instance.Output(String.Format("Import done, {0} assets imported", imported));
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index 5820a90..98106f0 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -36,7 +36,7 @@ using MySql.Data.MySqlClient;
 namespace OpenSim.Data.MySQL
 {
     /// <summary>
-    /// A database interface class to a user profile storage system
+    /// Common code for a number of database modules
     /// </summary>
     public class MySqlFramework
     {
@@ -44,30 +44,78 @@ namespace OpenSim.Data.MySQL
                 log4net.LogManager.GetLogger(
                 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected string m_connectionString;
+        protected string m_connectionString = String.Empty;
+        protected MySqlTransaction m_trans = null;
 
+        // Constructor using a connection string. Instances constructed
+        // this way will open a new connection for each call.
         protected MySqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
         }
 
+        // Constructor using a connection object. Instances constructed
+        // this way will use the connection object and never create
+        // new connections.
+        protected MySqlFramework(MySqlTransaction trans)
+        {
+            m_trans = trans;
+        }
+
+        //////////////////////////////////////////////////////////////
+        //
+        // All non queries are funneled through one connection
+        // to increase performance a little
+        //
         protected int ExecuteNonQuery(MySqlCommand cmd)
         {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            if (m_trans == null)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    int ret = ExecuteNonQueryWithConnection(cmd, dbcon);
+                    dbcon.Close();
+                    return ret;
+                }
+            }
+            else
+            {
+                return ExecuteNonQueryWithTransaction(cmd, m_trans);
+            }
+        }
+
+        private int ExecuteNonQueryWithTransaction(MySqlCommand cmd, MySqlTransaction trans)
+        {
+            cmd.Transaction = trans;
+            return ExecuteNonQueryWithConnection(cmd, trans.Connection);
+        }
+
+        private int ExecuteNonQueryWithConnection(MySqlCommand cmd, MySqlConnection dbcon)
+        {
+            try
             {
-                dbcon.Open();
                 cmd.Connection = dbcon;
 
                 try
                 {
-                    return cmd.ExecuteNonQuery();
+                    int ret = cmd.ExecuteNonQuery();
+                    cmd.Connection = null;
+                    return ret;
                 }
                 catch (Exception e)
                 {
                     m_log.Error(e.Message, e);
+                    m_log.Error(Environment.StackTrace.ToString());
+                    cmd.Connection = null;
                     return 0;
                 }
             }
+            catch (Exception e)
+            {
+                m_log.Error(e.Message, e);
+                return 0;
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 35fa89f..9bd3c0c 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Data.MySQL
     public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Dictionary<string, FieldInfo> m_Fields =
                 new Dictionary<string, FieldInfo>();
 
@@ -53,14 +53,27 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
+        public MySQLGenericTableHandler(MySqlTransaction trans,
+                string realm, string storeName) : base(trans)
+        {
+            m_Realm = realm;
+
+            CommonConstruct(storeName);
+        }
+
         public MySQLGenericTableHandler(string connectionString,
                 string realm, string storeName) : base(connectionString)
         {
             m_Realm = realm;
-            m_connectionString = connectionString;
-            
+
+            CommonConstruct(storeName);
+        }
+
+        protected void CommonConstruct(string storeName)
+        {
             if (storeName != String.Empty)
             {
+                // We always use a new connection for any Migrations
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
@@ -111,6 +124,11 @@ namespace OpenSim.Data.MySQL
 
         public virtual T[] Get(string[] fields, string[] keys)
         {
+            return Get(fields, keys, String.Empty);
+        }
+
+        public virtual T[] Get(string[] fields, string[] keys, string options)
+        {
             if (fields.Length != keys.Length)
                 return new T[0];
 
@@ -126,81 +144,107 @@ namespace OpenSim.Data.MySQL
 
                 string where = String.Join(" and ", terms.ToArray());
 
-                string query = String.Format("select * from {0} where {1}",
-                                             m_Realm, where);
+                string query = String.Format("select * from {0} where {1} {2}",
+                                             m_Realm, where, options);
 
                 cmd.CommandText = query;
-                
+
                 return DoQuery(cmd);
             }
         }
 
         protected T[] DoQuery(MySqlCommand cmd)
         {
+            if (m_trans == null)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    T[] ret = DoQueryWithConnection(cmd, dbcon);
+                    dbcon.Close();
+                    return ret;
+                }
+            }
+            else
+            {
+                return DoQueryWithTransaction(cmd, m_trans);
+            }
+        }
+
+        protected T[] DoQueryWithTransaction(MySqlCommand cmd, MySqlTransaction trans)
+        {
+            cmd.Transaction = trans;
+
+            return DoQueryWithConnection(cmd, trans.Connection);
+        }
+
+        protected T[] DoQueryWithConnection(MySqlCommand cmd, MySqlConnection dbcon)
+        {
             List<T> result = new List<T>();
 
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            cmd.Connection = dbcon;
+
+            using (IDataReader reader = cmd.ExecuteReader())
             {
-                dbcon.Open();
-                cmd.Connection = dbcon;
+                if (reader == null)
+                    return new T[0];
 
-                using (IDataReader reader = cmd.ExecuteReader())
-                {
-                    if (reader == null)
-                        return new T[0];
+                CheckColumnNames(reader);
 
-                    CheckColumnNames(reader);
+                while (reader.Read())
+                {
+                    T row = new T();
 
-                    while (reader.Read())
+                    foreach (string name in m_Fields.Keys)
                     {
-                        T row = new T();
-
-                        foreach (string name in m_Fields.Keys)
+                        if (reader[name] is DBNull)
+                        {
+                            continue;
+                        }
+                        if (m_Fields[name].FieldType == typeof(bool))
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v != 0 ? true : false);
+                        }
+                        else if (m_Fields[name].FieldType == typeof(UUID))
                         {
-                            if (reader[name] is DBNull)
-                            {
-                                continue;
-                            }
-                            if (m_Fields[name].FieldType == typeof(bool))
-                            {
-                                int v = Convert.ToInt32(reader[name]);
-                                m_Fields[name].SetValue(row, v != 0 ? true : false);
-                            }
-                            else if (m_Fields[name].FieldType == typeof(UUID))
-                            {
-                                m_Fields[name].SetValue(row, DBGuid.FromDB(reader[name]));
-                            }
-                            else if (m_Fields[name].FieldType == typeof(int))
-                            {
-                                int v = Convert.ToInt32(reader[name]);
-                                m_Fields[name].SetValue(row, v);
-                            }
-                            else
-                            {
-                                m_Fields[name].SetValue(row, reader[name]);
-                            }
+                            m_Fields[name].SetValue(row, DBGuid.FromDB(reader[name]));
                         }
-                
-                        if (m_DataField != null)
+                        else if (m_Fields[name].FieldType == typeof(int))
                         {
-                            Dictionary<string, string> data =
-                                new Dictionary<string, string>();
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v);
+                        }
+                        else if (m_Fields[name].FieldType == typeof(uint))
+                        {
+                            uint v = Convert.ToUInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v);
+                        }
+                        else
+                        {
+                            m_Fields[name].SetValue(row, reader[name]);
+                        }
+                    }
 
-                            foreach (string col in m_ColumnNames)
-                            {
-                                data[col] = reader[col].ToString();
-                                if (data[col] == null)
-                                    data[col] = String.Empty;
-                            }
+                    if (m_DataField != null)
+                    {
+                        Dictionary<string, string> data =
+                            new Dictionary<string, string>();
 
-                            m_DataField.SetValue(row, data);
+                        foreach (string col in m_ColumnNames)
+                        {
+                            data[col] = reader[col].ToString();
+                            if (data[col] == null)
+                                data[col] = String.Empty;
                         }
 
-                        result.Add(row);
+                        m_DataField.SetValue(row, data);
                     }
+
+                    result.Add(row);
                 }
             }
-
+            cmd.Connection = null;
             return result.ToArray();
         }
 
@@ -210,9 +254,9 @@ namespace OpenSim.Data.MySQL
             {
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
-                
+
                 cmd.CommandText = query;
-                
+
                 return DoQuery(cmd);
             }
         }
@@ -231,16 +275,16 @@ namespace OpenSim.Data.MySQL
                 {
                     names.Add(fi.Name);
                     values.Add("?" + fi.Name);
-                    
+
                     // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // 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(
-                                "[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null", 
+                                "[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
                                 fi.Name, row));
-                    
+
                     cmd.Parameters.AddWithValue(fi.Name, fi.GetValue(row).ToString());
                 }
 
@@ -352,14 +396,26 @@ namespace OpenSim.Data.MySQL
 
         public object DoQueryScalar(MySqlCommand cmd)
         {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            if (m_trans == null)
             {
-                dbcon.Open();
-                cmd.Connection = dbcon;
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+                    cmd.Connection = dbcon;
+
+                    Object ret = cmd.ExecuteScalar();
+                    cmd.Connection = null;
+                    dbcon.Close();
+                    return ret;
+                }
+            }
+            else
+            {
+                cmd.Connection = m_trans.Connection;
+                cmd.Transaction = m_trans;
 
                 return cmd.ExecuteScalar();
             }
         }
-
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs
index afa499e..4e73ee7 100644
--- a/OpenSim/Data/MySQL/MySQLGroupsData.cs
+++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs
@@ -133,10 +133,10 @@ namespace OpenSim.Data.MySQL
 
         public bool DeleteMember(UUID groupID, string pricipalID)
         {
-            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+            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());
@@ -168,7 +168,7 @@ namespace OpenSim.Data.MySQL
 
         public bool DeleteRole(UUID groupID, UUID roleID)
         {
-            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" },
                                   new string[] { groupID.ToString(), roleID.ToString() });
         }
 
@@ -360,7 +360,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+        public MySqlGroupsGroupsHandler(string connectionString, string realm, string store)
             : base(connectionString, realm, store)
         {
         }
@@ -375,7 +375,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsMembershipHandler(string connectionString, string realm) 
+        public MySqlGroupsMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -390,7 +390,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsRolesHandler(string connectionString, string realm) 
+        public MySqlGroupsRolesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -405,7 +405,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+        public MySqlGroupsRoleMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -420,7 +420,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsInvitesHandler(string connectionString, string realm) 
+        public MySqlGroupsInvitesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -431,8 +431,7 @@ namespace OpenSim.Data.MySQL
 
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm);
-                cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
 
                 ExecuteNonQuery(cmd);
             }
@@ -448,7 +447,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsNoticesHandler(string connectionString, string realm) 
+        public MySqlGroupsNoticesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -476,7 +475,7 @@ namespace OpenSim.Data.MySQL
             get { return GetType().Assembly; }
         }
 
-        public MySqlGroupsPrincipalsHandler(string connectionString, string realm) 
+        public MySqlGroupsPrincipalsHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index e9b10f3..cc787cc 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, assem, "InventoryStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -130,6 +131,7 @@ namespace OpenSim.Data.MySQL
                                         items.Add(item);
                                 }
 
+                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -170,6 +172,7 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                     items.Add(readInventoryFolder(reader));
 
+                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -221,6 +224,7 @@ namespace OpenSim.Data.MySQL
                                 if (items.Count > 0)
                                     rootFolder = items[0];
 
+                                dbcon.Close();
                                 return rootFolder;
                             }
                         }
@@ -261,6 +265,7 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                     items.Add(readInventoryFolder(reader));
 
+                                dbcon.Close();
                                 return items;
                             }
                         }
@@ -288,7 +293,7 @@ namespace OpenSim.Data.MySQL
                 // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy.  It would be nice to live fix these.
                 // (DBGuid.FromDB() reads db NULLs as well, returns UUID.Zero)
                 item.CreatorId = reader["creatorID"].ToString();
-                
+
                 // Be a bit safer in parsing these because the
                 // database doesn't enforce them to be not null, and
                 // the inventory still works if these are weird in the
@@ -352,6 +357,7 @@ namespace OpenSim.Data.MySQL
                                 if (reader.Read())
                                     item = readInventoryItem(reader);
 
+                                dbcon.Close();
                                 return item;
                             }
                         }
@@ -417,6 +423,7 @@ namespace OpenSim.Data.MySQL
                                 if (reader.Read())
                                     folder = readInventoryFolder(reader);
 
+                                dbcon.Close();
                                 return folder;
                             }
                         }
@@ -453,7 +460,7 @@ namespace OpenSim.Data.MySQL
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length + " to " + itemName.Length + " characters on add item");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
@@ -490,10 +497,10 @@ namespace OpenSim.Data.MySQL
                         result.Parameters.AddWithValue("?groupID", item.GroupID);
                         result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
                         result.Parameters.AddWithValue("?flags", item.Flags);
-    
+
                         lock (m_dbLock)
                             result.ExecuteNonQuery();
-    
+
                         result.Dispose();
                     }
 
@@ -504,6 +511,7 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             result.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -540,6 +548,7 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -600,6 +609,7 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(e.ToString());
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -630,7 +640,7 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
                     cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
-    
+
                     try
                     {
                         lock (m_dbLock)
@@ -643,6 +653,7 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(e.ToString());
                     }
                 }
+                dbcon.Close();
             }
         }
 
@@ -806,6 +817,7 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -833,6 +845,7 @@ namespace OpenSim.Data.MySQL
                         lock (m_dbLock)
                             cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (MySqlException e)
@@ -860,7 +873,7 @@ namespace OpenSim.Data.MySQL
             deleteOneFolder(folderID);
             deleteItemsInFolder(folderID);
         }
-        
+
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
         {
             lock (m_dbLock)
@@ -886,6 +899,7 @@ namespace OpenSim.Data.MySQL
                                     if (item != null)
                                         list.Add(item);
                                 }
+                                dbcon.Close();
                                 return list;
                             }
                         }
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
index 81a0e83..2043dae 100644
--- a/OpenSim/Data/MySQL/MySQLMigrations.cs
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Data.MySQL
 {
     /// <summary>This is a MySQL-customized migration processor.  The only difference is in how
     /// it executes SQL scripts (using MySqlScript instead of MyCommand)
-    /// 
+    ///
     /// </summary>
     public class MySqlMigration : Migration
     {
         public MySqlMigration()
             : base()
-        { 
+        {
         }
 
-        public MySqlMigration(DbConnection conn, Assembly assem, string subtype, string type) : 
+        public MySqlMigration(DbConnection conn, Assembly assem, string subtype, string type) :
             base(conn, assem, subtype, type)
         {
         }
diff --git a/OpenSim/Data/MySQL/MySQLMuteListData.cs b/OpenSim/Data/MySQL/MySQLMuteListData.cs
new file mode 100644
index 0000000..a5935a3
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLMuteListData.cs
@@ -0,0 +1,67 @@
+/*
+ * 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 MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    public class MySqlMuteListData : MySQLGenericTableHandler<MuteData>, IMuteListData
+    {
+        public MySqlMuteListData(string connectionString)
+                : base(connectionString, "MuteList", "MuteListStore")
+        {
+        }
+
+        public MuteData[] Get(UUID agentID)
+        {
+            MuteData[] data = base.Get("AgentID", agentID.ToString());
+            return data;
+        }
+
+        public bool Delete(UUID agentID, UUID muteID, string muteName)
+        {
+            string cmnd ="delete from MuteList where AgentID = ?AgentID and MuteID = ?MuteID and MuteName = ?MuteName";
+
+            using (MySqlCommand cmd = new MySqlCommand(cmnd))
+            {
+                cmd.Parameters.AddWithValue("?AgentID", agentID.ToString());
+                cmd.Parameters.AddWithValue("?MuteID", muteID.ToString());
+                cmd.Parameters.AddWithValue("?MuteName", muteName);
+
+                if (ExecuteNonQuery(cmd) > 0)
+                    return true;
+                return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index bafd204..7608858 100644
--- a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
-         
+
                 ExecuteNonQuery(cmd);
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 3f90639..70aca5f 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -66,9 +66,9 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 ExecuteNonQuery(cmd);
             }
         }
@@ -85,10 +85,10 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) == 0)
                     return false;
             }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 2ad7590..46df421 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "GridStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -82,6 +83,7 @@ namespace OpenSim.Data.MySQL
 
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
+/* fixed size regions
             string command = "select * from `"+m_Realm+"` where locX = ?posX and locY = ?posY";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
@@ -98,6 +100,45 @@ namespace OpenSim.Data.MySQL
 
                 return ret[0];
             }
+*/
+            // extend database search for maximum region size area
+            string command = "select * from `" + m_Realm + "` where locX between ?startX and ?endX and locY between ?startY and ?endY";
+            if (scopeID != UUID.Zero)
+                command += " and ScopeID = ?scopeID";
+
+            int startX = posX - (int)Constants.MaximumRegionSize;
+            int startY = posY - (int)Constants.MaximumRegionSize;
+            int endX = posX;
+            int endY = posY;
+
+            List<RegionData> ret;
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?startX", startX.ToString());
+                cmd.Parameters.AddWithValue("?startY", startY.ToString());
+                cmd.Parameters.AddWithValue("?endX", endX.ToString());
+                cmd.Parameters.AddWithValue("?endY", endY.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+                ret = RunCommand(cmd);
+            }
+
+            if (ret.Count == 0)
+                return null;
+
+            // find the first that contains pos
+            RegionData rg = null;
+            foreach (RegionData r in ret)
+            {
+                if (posX >= r.posX && posX < r.posX + r.sizeX
+                    && posY >= r.posY && posY < r.posY + r.sizeY)
+                {
+                    rg = r;
+                    break;
+                }
+            }
+
+            return rg;
         }
 
         public RegionData Get(UUID regionID, UUID scopeID)
@@ -121,6 +162,7 @@ namespace OpenSim.Data.MySQL
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
+/* fix size regions
             string command = "select * from `"+m_Realm+"` where locX between ?startX and ?endX and locY between ?startY and ?endY";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
@@ -135,6 +177,38 @@ namespace OpenSim.Data.MySQL
 
                 return RunCommand(cmd);
             }
+ */
+            string command = "select * from `" + m_Realm + "` where locX between ?startX and ?endX and locY between ?startY and ?endY";
+            if (scopeID != UUID.Zero)
+                command += " and ScopeID = ?scopeID";
+
+            int qstartX = startX - (int)Constants.MaximumRegionSize;
+            int qstartY = startY - (int)Constants.MaximumRegionSize;
+
+            List<RegionData> dbret;
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?startX", qstartX.ToString());
+                cmd.Parameters.AddWithValue("?startY", qstartY.ToString());
+                cmd.Parameters.AddWithValue("?endX", endX.ToString());
+                cmd.Parameters.AddWithValue("?endY", endY.ToString());
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+                dbret = RunCommand(cmd);
+            }
+
+            List<RegionData> ret = new List<RegionData>();
+
+            if (dbret.Count == 0)
+                return ret;
+
+            foreach (RegionData r in dbret)
+            {
+                if (r.posX + r.sizeX > startX && r.posX <= endX
+                    && r.posY + r.sizeY > startY && r.posY <= endY)
+                    ret.Add(r);
+            }
+            return ret;
         }
 
         public List<RegionData> RunCommand(MySqlCommand cmd)
@@ -187,6 +261,8 @@ namespace OpenSim.Data.MySQL
                         retList.Add(ret);
                     }
                 }
+                cmd.Connection = null;
+                dbcon.Close();
             }
 
             return retList;
@@ -337,7 +413,7 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand(command))
             {
                 cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-    
+
                 return RunCommand(cmd);
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index bb0ab75..e754522 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MySQL
         /// <summary>
         /// This lock was being used to serialize database operations when the connection was shared, but this has
         /// been unnecessary for a long time after we switched to using MySQL's underlying connection pooling instead.
-        /// FIXME: However, the locks remain in many places since they are effectively providing a level of 
+        /// FIXME: However, the locks remain in many places since they are effectively providing a level of
         /// transactionality.  This should be replaced by more efficient database transactions which would not require
         /// unrelated operations to block each other or unrelated operations on the same tables from blocking each
         /// other.
@@ -76,7 +76,7 @@ namespace OpenSim.Data.MySQL
             Initialise(connectionString);
         }
 
-        public void Initialise(string connectionString)
+        public virtual void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
 
@@ -88,6 +88,7 @@ namespace OpenSim.Data.MySQL
                 //
                 Migration m = new Migration(dbcon, Assembly, "RegionStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -123,7 +124,7 @@ namespace OpenSim.Data.MySQL
 
         public void Dispose() {}
 
-        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             uint flags = obj.RootPart.GetEffectiveObjectFlags();
 
@@ -167,7 +168,7 @@ namespace OpenSim.Data.MySQL
                                     "SitTargetOrientY, SitTargetOrientZ, " +
                                     "RegionUUID, CreatorID, " +
                                     "OwnerID, GroupID, " +
-                                    "LastOwnerID, SceneGroupID, " +
+                                    "LastOwnerID, RezzerID, SceneGroupID, " +
                                     "PayPrice, PayButton1, " +
                                     "PayButton2, PayButton3, " +
                                     "PayButton4, LoopedSound, " +
@@ -183,10 +184,12 @@ namespace OpenSim.Data.MySQL
                                     "ParticleSystem, ClickAction, Material, " +
                                     "CollisionSound, CollisionSoundVolume, " +
                                     "PassTouches, " +
-                                    "LinkNumber, MediaURL, AttachedPosX, " +
-                                    "AttachedPosY, AttachedPosZ, KeyframeMotion, " +
+                                    "PassCollisions, " +
+                                    "LinkNumber, MediaURL, KeyframeMotion, AttachedPosX, " +
+                                    "AttachedPosY, AttachedPosZ, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
-                                    "Friction, Restitution, DynAttrs " +
+                                    "Friction, Restitution, Vehicle, PhysInertia, DynAttrs, " +
+                                    "RotationAxisLocks" +
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
@@ -205,7 +208,7 @@ namespace OpenSim.Data.MySQL
                                     "?SitTargetOrientW, ?SitTargetOrientX, " +
                                     "?SitTargetOrientY, ?SitTargetOrientZ, " +
                                     "?RegionUUID, ?CreatorID, ?OwnerID, " +
-                                    "?GroupID, ?LastOwnerID, ?SceneGroupID, " +
+                                    "?GroupID, ?LastOwnerID, ?RezzerID, ?SceneGroupID, " +
                                     "?PayPrice, ?PayButton1, ?PayButton2, " +
                                     "?PayButton3, ?PayButton4, ?LoopedSound, " +
                                     "?LoopedSoundGain, ?TextureAnimation, " +
@@ -218,11 +221,12 @@ namespace OpenSim.Data.MySQL
                                     "?SaleType, ?ColorR, ?ColorG, " +
                                     "?ColorB, ?ColorA, ?ParticleSystem, " +
                                     "?ClickAction, ?Material, ?CollisionSound, " +
-                                    "?CollisionSoundVolume, ?PassTouches, " +
-                                    "?LinkNumber, ?MediaURL, ?AttachedPosX, " +
-                                    "?AttachedPosY, ?AttachedPosZ, ?KeyframeMotion, " +
+                                    "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
+                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, ?AttachedPosX, " +
+                                    "?AttachedPosY, ?AttachedPosZ, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                    "?Friction, ?Restitution, ?DynAttrs)";
+                                    "?Friction, ?Restitution, ?Vehicle, ?PhysInertia, ?DynAttrs," +
+                                    "?RotationAxisLocks)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -258,14 +262,15 @@ namespace OpenSim.Data.MySQL
                             ExecuteNonQuery(cmd);
                         }
                     }
+                    dbcon.Close();
                 }
             }
         }
 
-        public void RemoveObject(UUID obj, UUID regionUUID)
+        public virtual void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
-            
+
             List<UUID> uuids = new List<UUID>();
 
             // Formerly, this used to check the region UUID.
@@ -297,6 +302,7 @@ namespace OpenSim.Data.MySQL
                         cmd.CommandText = "delete from prims where SceneGroupID= ?UUID";
                         ExecuteNonQuery(cmd);
                     }
+                    dbcon.Close();
                 }
             }
 
@@ -317,7 +323,8 @@ namespace OpenSim.Data.MySQL
         /// <param name="uuid">the Item UUID</param>
         private void RemoveItems(UUID uuid)
         {
-            lock (m_dbLock)
+            // locked by caller
+//            lock (m_dbLock)
             {
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
@@ -330,6 +337,7 @@ namespace OpenSim.Data.MySQL
 
                         ExecuteNonQuery(cmd);
                     }
+                    dbcon.Close();
                 }
             }
         }
@@ -368,6 +376,7 @@ namespace OpenSim.Data.MySQL
 
                         ExecuteNonQuery(cmd);
                     }
+                    dbcon.Close();
                 }
             }
         }
@@ -407,11 +416,12 @@ namespace OpenSim.Data.MySQL
 
                         ExecuteNonQuery(cmd);
                     }
+                    dbcon.Close();
                 }
             }
         }
 
-        public List<SceneObjectGroup> LoadObjects(UUID regionID)
+        public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
             const int ROWS_PER_QUERY = 5000;
 
@@ -456,6 +466,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
 
@@ -505,7 +516,7 @@ namespace OpenSim.Data.MySQL
             #region Prim Inventory Loading
 
             // Instead of attempting to LoadItems on every prim,
-            // most of which probably have no items... get a 
+            // most of which probably have no items... get a
             // list from DB of all prims which have items and
             // LoadItems only on those
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
@@ -531,6 +542,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
 
@@ -576,6 +588,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
 
                 prim.Inventory.RestoreInventoryItems(inventory);
@@ -590,40 +603,102 @@ namespace OpenSim.Data.MySQL
 
         public void StoreTerrain(TerrainData terrData, UUID regionID)
         {
-            lock (m_dbLock)
+            Util.FireAndForget(delegate(object x)
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                m_log.Info("[REGION DB]: Storing terrain");
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                int terrainDBRevision;
+                Array terrainDBblob;
+                terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+
+                lock (m_dbLock)
+                {
+                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                     {
-                        cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
-                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        dbcon.Open();
 
-                        ExecuteNonQuery(cmd);
+                        using (MySqlCommand cmd = dbcon.CreateCommand())
+                        {
+                            cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                        int terrainDBRevision;
-                        Array terrainDBblob;
-                        terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
+                            {
+                                try
+                                {
+                                    cmd2.CommandText = "insert into terrain (RegionUUID, " +
+                                            "Revision, Heightfield) values (?RegionUUID, " +
+                                            "?Revision, ?Heightfield)";
 
-                        m_log.InfoFormat("{0} Storing terrain. X={1}, Y={2}, rev={3}",
-                                    LogHeader, terrData.SizeX, terrData.SizeY, terrainDBRevision);
+                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                                    cmd2.Parameters.AddWithValue("Revision", terrainDBRevision);
+                                    cmd2.Parameters.AddWithValue("Heightfield", terrainDBblob);
 
-                        cmd.CommandText = "insert into terrain (RegionUUID, Revision, Heightfield)"
-                        +   "values (?RegionUUID, ?Revision, ?Heightfield)";
+                                    ExecuteNonQuery(cmd);
+                                    ExecuteNonQuery(cmd2);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.ErrorFormat(e.ToString());
+                                }
+                            }
+                        }
+                        dbcon.Close();
+                    }
+                }
+            });
+        }
 
-                        cmd.Parameters.AddWithValue("Revision", terrainDBRevision);
-                        cmd.Parameters.AddWithValue("Heightfield", terrainDBblob);
+        public void StoreBakedTerrain(TerrainData terrData, UUID regionID)
+        {
+            Util.FireAndForget(delegate(object x)
+            {
+                m_log.Info("[REGION DB]: Storing Baked terrain");
 
-                        ExecuteNonQuery(cmd);
+                int terrainDBRevision;
+                Array terrainDBblob;
+                terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+
+                lock (m_dbLock)
+                {
+                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                    {
+                        dbcon.Open();
+
+                        using (MySqlCommand cmd = dbcon.CreateCommand())
+                        {
+                            cmd.CommandText = "delete from bakedterrain where RegionUUID = ?RegionUUID";
+                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+
+                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
+                            {
+                                try
+                                {
+                                    cmd2.CommandText = "insert into bakedterrain (RegionUUID, " +
+                                            "Revision, Heightfield) values (?RegionUUID, " +
+                                            "?Revision, ?Heightfield)";
+
+                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                                    cmd2.Parameters.AddWithValue("Revision", terrainDBRevision);
+                                    cmd2.Parameters.AddWithValue("Heightfield", terrainDBblob);
+
+                                    ExecuteNonQuery(cmd);
+                                    ExecuteNonQuery(cmd2);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.ErrorFormat(e.ToString());
+                                }
+                            }
+                        }
+                        dbcon.Close();
                     }
                 }
-            }
+            });
         }
 
         // Legacy region loading
-        public double[,] LoadTerrain(UUID regionID)
+        public virtual double[,] LoadTerrain(UUID regionID)
         {
             double[,] ret = null;
             TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
@@ -636,9 +711,12 @@ namespace OpenSim.Data.MySQL
         public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
         {
             TerrainData terrData = null;
+            byte[] blob = null;
+            int rev = 0;
 
             lock (m_dbLock)
             {
+
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
@@ -654,19 +732,64 @@ namespace OpenSim.Data.MySQL
                         {
                             while (reader.Read())
                             {
-                                int rev = Convert.ToInt32(reader["Revision"]);
-                                byte[] blob = (byte[])reader["Heightfield"];
-                                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                                rev = Convert.ToInt32(reader["Revision"]);
+                                if ((reader["Heightfield"] != DBNull.Value))
+                                {
+                                    blob = (byte[])reader["Heightfield"];
+                                }
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+
+            if(blob != null)
+                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+
+            return terrData;
+        }
+
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            TerrainData terrData = null;
+            byte[] blob = null;
+            int rev = 0;
+
+            lock (m_dbLock)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "select RegionUUID, Revision, Heightfield " +
+                            "from bakedterrain where RegionUUID = ?RegionUUID ";
+                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+
+                        using (IDataReader reader = ExecuteReader(cmd))
+                        {
+                            while (reader.Read())
+                            {
+                                rev = Convert.ToInt32(reader["Revision"]);
+                                if ((reader["Heightfield"] != DBNull.Value))
+                                {
+                                    blob = (byte[])reader["Heightfield"];
+                                }
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
+            if(blob != null)
+                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
 
             return terrData;
         }
 
-        public void RemoveLandObject(UUID globalID)
+        public virtual void RemoveLandObject(UUID globalID)
         {
             lock (m_dbLock)
             {
@@ -681,11 +804,12 @@ namespace OpenSim.Data.MySQL
 
                         ExecuteNonQuery(cmd);
                     }
+                    dbcon.Close();
                 }
             }
         }
 
-        public void StoreLandObject(ILandObject parcel)
+        public virtual void StoreLandObject(ILandObject parcel)
         {
             lock (m_dbLock)
             {
@@ -705,7 +829,8 @@ namespace OpenSim.Data.MySQL
                             "UserLocationX, UserLocationY, UserLocationZ, " +
                             "UserLookAtX, UserLookAtY, UserLookAtZ, " +
                             "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " +
-                            "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" +
+                            "MediaSize, MediaLoop, ObscureMusic, ObscureMedia, " +
+                            "SeeAVs, AnyAVSounds, GroupAVSounds) values (" +
                             "?UUID, ?RegionUUID, " +
                             "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
                             "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " +
@@ -716,7 +841,8 @@ namespace OpenSim.Data.MySQL
                             "?UserLocationX, ?UserLocationY, ?UserLocationZ, " +
                             "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
                             "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+
-                            "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)";
+                            "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia, " +
+                            "?SeeAVs, ?AnyAVSounds, ?GroupAVSounds)";
 
                         FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
 
@@ -738,11 +864,12 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.Clear();
                         }
                     }
+                    dbcon.Close();
                 }
             }
         }
 
-        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
@@ -759,90 +886,94 @@ namespace OpenSim.Data.MySQL
 
                     cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
 
-                    IDataReader result = ExecuteReader(cmd);
-                    if (!result.Read())
+                    using(IDataReader result = ExecuteReader(cmd))
                     {
-                        //No result, so store our default windlight profile and return it
-                        nWP.regionID = regionUUID;
-//                            StoreRegionWindlightSettings(nWP);
-                        return nWP;
-                    }
-                    else
-                    {
-                        nWP.regionID = DBGuid.FromDB(result["region_id"]);
-                        nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
-                        nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
-                        nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
-                        nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
-                        nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
-                        nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
-                        nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
-                        nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
-                        nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
-                        nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
-                        nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
-                        nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
-                        nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
-                        nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
-                        nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
-                        nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
-                        nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
-                        UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
-                        nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
-                        nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
-                        nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
-                        nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
-                        nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
-                        nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
-                        nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
-                        nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
-                        nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
-                        nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
-                        nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
-                        nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
-                        nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
-                        nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
-                        nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
-                        nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
-                        nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
-                        nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
-                        nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
-                        nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
-                        nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
-                        nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
-                        nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
-                        nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
-                        nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
-                        nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
-                        nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
-                        nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
-                        nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
-                        nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
-                        nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
-                        nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
-                        nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
-                        nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
-                        nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
-                        nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
-                        nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
-                        nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
-                        nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
-                        nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
-                        nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
-                        nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
-                        nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
-                        nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
-                        nWP.valid = true;
+                        if(!result.Read())
+                        {
+                            //No result, so store our default windlight profile and return it
+                            nWP.regionID = regionUUID;
+                            //                            StoreRegionWindlightSettings(nWP);
+                            return nWP;
+                        }
+                        else
+                        {
+                            nWP.regionID = DBGuid.FromDB(result["region_id"]);
+                            nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
+                            nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
+                            nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
+                            nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
+                            nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
+                            nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
+                            nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
+                            nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
+                            nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
+                            nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
+                            nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
+                            nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
+                            nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
+                            nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
+                            nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
+                            nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
+                            nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
+                            UUID.TryParse(result["normal_map_texture"].ToString(),out nWP.normalMapTexture);
+                            nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
+                            nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
+                            nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
+                            nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
+                            nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
+                            nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
+                            nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
+                            nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
+                            nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
+                            nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
+                            nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
+                            nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
+                            nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
+                            nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
+                            nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
+                            nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
+                            nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
+                            nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
+                            nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
+                            nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
+                            nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
+                            nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
+                            nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
+                            nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
+                            nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
+                            nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
+                            nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
+                            nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
+                            nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
+                            nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
+                            nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
+                            nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
+                            nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
+                            nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
+                            nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
+                            nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
+                            nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
+                            nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
+                            nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
+                            nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
+                            nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
+                            nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
+                            nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
+                            nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                            nWP.valid = true;
+                        }
                     }
                 }
+                dbcon.Close();
             }
 
             return nWP;
         }
 
-        public RegionSettings LoadRegionSettings(UUID regionUUID)
+        public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
+            bool needStore = false;
 
             lock (m_dbLock)
             {
@@ -868,19 +999,23 @@ namespace OpenSim.Data.MySQL
                                 rs.RegionUUID = regionUUID;
                                 rs.OnSave += StoreRegionSettings;
 
-                                StoreRegionSettings(rs);
+                                needStore = true;
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
 
+            if(needStore)
+                StoreRegionSettings(rs);
+
             LoadSpawnPoints(rs);
 
             return rs;
         }
 
-        public void StoreRegionWindlightSettings(RegionLightShareData wl)
+        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -888,31 +1023,32 @@ namespace OpenSim.Data.MySQL
 
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
-                    cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, ";
-                    cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, ";
-                    cmd.CommandText += "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, ";
-                    cmd.CommandText += "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, ";
-                    cmd.CommandText += "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, ";
-                    cmd.CommandText += "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, ";
-                    cmd.CommandText += "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, ";
-                    cmd.CommandText += "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, ";
-                    cmd.CommandText += "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, ";
-                    cmd.CommandText += "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, ";
-                    cmd.CommandText += "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, ";
-                    cmd.CommandText += "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, ";
-                    cmd.CommandText += "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, ";
-                    cmd.CommandText += "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, ";
-                    cmd.CommandText += "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, ";
-                    cmd.CommandText += "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, ";
-                    cmd.CommandText += "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, ";
-                    cmd.CommandText += "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, ";
-                    cmd.CommandText += "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, ";
-                    cmd.CommandText += "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, ";
-                    cmd.CommandText += "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, ";
-                    cmd.CommandText += "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, ";
-                    cmd.CommandText += "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, ";
-                    cmd.CommandText += "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, ";
-                    cmd.CommandText += "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)";
+                    cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, "
+                            + "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, "
+                            + "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, "
+                            + "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, "
+                            + "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, "
+                            + "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, "
+                            + "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, "
+                            + "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, "
+                            + "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, "
+                            + "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, "
+                            + "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, "
+                            + "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, "
+                            + "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, "
+                            + "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, "
+                            + "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, "
+                            + "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, "
+                            + "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, "
+                            + "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, "
+                            + "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, "
+                            + "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, "
+                            + "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, "
+                            + "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, "
+                            + "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, "
+                            + "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, "
+                            + "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)"
+                            ;
 
                     cmd.Parameters.AddWithValue("region_id", wl.regionID);
                     cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
@@ -977,13 +1113,14 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
                     cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
                     cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
-                    
+
                     ExecuteNonQuery(cmd);
                 }
+                dbcon.Close();
             }
         }
 
-        public void RemoveRegionWindlightSettings(UUID regionID)
+        public virtual void RemoveRegionWindlightSettings(UUID regionID)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -995,6 +1132,7 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
                     ExecuteNonQuery(cmd);
                 }
+                dbcon.Close();
             }
         }
 
@@ -1013,14 +1151,19 @@ namespace OpenSim.Data.MySQL
 
                     cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
 
-                    IDataReader result = ExecuteReader(cmd);
-                    if (!result.Read())
+                    using(IDataReader result = ExecuteReader(cmd))
                     {
-                        return String.Empty;
-                    }
-                    else
-                    {
-                        return Convert.ToString(result["llsd_settings"]);
+                        if(!result.Read())
+                        {
+                            dbcon.Close();
+                            return String.Empty;
+                        }
+                        else
+                        {
+                            string ret = Convert.ToString(result["llsd_settings"]);
+                            dbcon.Close();
+                            return ret;
+                        }
                     }
                 }
             }
@@ -1041,6 +1184,7 @@ namespace OpenSim.Data.MySQL
 
                     ExecuteNonQuery(cmd);
                 }
+                dbcon.Close();
             }
         }
 
@@ -1056,11 +1200,12 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?region_id", regionUUID.ToString());
                     ExecuteNonQuery(cmd);
                 }
+                dbcon.Close();
             }
         }
         #endregion
 
-        public void StoreRegionSettings(RegionSettings rs)
+        public virtual void StoreRegionSettings(RegionSettings rs)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -1069,52 +1214,51 @@ namespace OpenSim.Data.MySQL
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
                     cmd.CommandText = "replace into 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, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
-                        "sunvectorz, loaded_creation_datetime, " +
-                        "loaded_creation_id, map_tile_ID, " +
-                        "TelehubObject, parcel_tile_ID) " +
-                         "values (?RegionUUID, ?BlockTerraform, " +
-                        "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
-                        "?AllowLandResell, ?AllowLandJoinDivide, " +
-                        "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
-                        "?Maturity, ?DisableScripts, ?DisableCollisions, " +
-                        "?DisablePhysics, ?TerrainTexture1, " +
-                        "?TerrainTexture2, ?TerrainTexture3, " +
-                        "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
-                        "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
-                        "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
-                        "?WaterHeight, ?TerrainRaiseLimit, " +
-                        "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
-                        "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
-                        "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
-                        "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                        "?TerrainImageID, " +
-                        "?TelehubObject, ?ParcelImageID)";
+                         "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, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
+                         "sunvectorz, loaded_creation_datetime, " +
+                         "loaded_creation_id, map_tile_ID, block_search, casino, " +
+                         "TelehubObject, parcel_tile_ID) " +
+                          "values (?RegionUUID, ?BlockTerraform, " +
+                         "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
+                         "?AllowLandResell, ?AllowLandJoinDivide, " +
+                         "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
+                         "?Maturity, ?DisableScripts, ?DisableCollisions, " +
+                         "?DisablePhysics, ?TerrainTexture1, " +
+                         "?TerrainTexture2, ?TerrainTexture3, " +
+                         "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
+                         "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
+                         "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
+                         "?WaterHeight, ?TerrainRaiseLimit, " +
+                         "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
+                         "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
+                         "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
+                         "?LoadedCreationDateTime, ?LoadedCreationID, " +
+                         "?TerrainImageID, ?block_search, ?casino, " +
+                         "?TelehubObject, ?ParcelImageID)";
 
                     FillRegionSettingsCommand(cmd, rs);
-
                     ExecuteNonQuery(cmd);
                 }
+                dbcon.Close();
+                SaveSpawnPoints(rs);
             }
-
-            SaveSpawnPoints(rs);
         }
 
-        public List<LandData> LoadLandObjects(UUID regionUUID)
+        public virtual List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landData = new List<LandData>();
 
@@ -1156,6 +1300,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
 
@@ -1170,12 +1315,16 @@ namespace OpenSim.Data.MySQL
         {
             SceneObjectPart prim = new SceneObjectPart();
 
-            // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! 
+            // depending on the MySQL connector version, CHAR(36) may be already converted to Guid!
             prim.UUID = DBGuid.FromDB(row["UUID"]);
             prim.CreatorIdentification = (string)row["CreatorID"];
             prim.OwnerID = DBGuid.FromDB(row["OwnerID"]);
             prim.GroupID = DBGuid.FromDB(row["GroupID"]);
             prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]);
+            if (row["RezzerID"] != DBNull.Value)
+                prim.RezzerID = DBGuid.FromDB(row["RezzerID"]);
+            else
+                prim.RezzerID = UUID.Zero;
 
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
@@ -1294,10 +1443,11 @@ namespace OpenSim.Data.MySQL
 
             prim.CollisionSound = DBGuid.FromDB(row["CollisionSound"]);
             prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
-            
+
             prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
+            prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
-            
+
             if (!(row["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)row["MediaURL"];
 
@@ -1313,7 +1463,7 @@ namespace OpenSim.Data.MySQL
             if (!(row["DynAttrs"] is System.DBNull))
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();        
+                prim.DynAttrs = new DAMap();
 
             if (!(row["KeyframeMotion"] is DBNull))
             {
@@ -1333,7 +1483,22 @@ namespace OpenSim.Data.MySQL
             prim.GravityModifier = (float)(double)row["GravityModifier"];
             prim.Friction = (float)(double)row["Friction"];
             prim.Restitution = (float)(double)row["Restitution"];
-            
+            prim.RotationAxisLocks = (byte)Convert.ToInt32(row["RotationAxisLocks"].ToString());
+
+            SOPVehicle vehicle = null;
+
+            if (row["Vehicle"].ToString() != String.Empty)
+            {
+                vehicle = SOPVehicle.FromXml2(row["Vehicle"].ToString());
+                if (vehicle != null)
+                    prim.VehicleParams = vehicle;
+            }
+
+            PhysicsInertiaData pdata = null;
+            if (row["PhysInertia"].ToString() != String.Empty)
+                pdata = PhysicsInertiaData.FromXml2(row["PhysInertia"].ToString());
+            prim.PhysicsInertia = pdata;
+
             return prim;
         }
 
@@ -1344,32 +1509,40 @@ namespace OpenSim.Data.MySQL
         /// <returns></returns>
         private static TaskInventoryItem BuildItem(IDataReader row)
         {
-            TaskInventoryItem taskItem = new TaskInventoryItem();
-
-            taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
-            taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
-            taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
-            taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
-
-            taskItem.InvType       = Convert.ToInt32(row["invType"]);
-            taskItem.Type          = Convert.ToInt32(row["assetType"]);
-
-            taskItem.Name          = (String)row["name"];
-            taskItem.Description   = (String)row["description"];
-            taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorIdentification = (String)row["creatorID"];
-            taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
-            taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
-            taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
-
-            taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
-            taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
-            taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
-            taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
-            taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
-            taskItem.Flags         = Convert.ToUInt32(row["flags"]);
-
-            return taskItem;
+            try
+            {
+                TaskInventoryItem taskItem = new TaskInventoryItem();
+
+                taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
+                taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
+                taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
+                taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
+
+                taskItem.InvType       = Convert.ToInt32(row["invType"]);
+                taskItem.Type          = Convert.ToInt32(row["assetType"]);
+
+                taskItem.Name          = (String)row["name"];
+                taskItem.Description   = (String)row["description"];
+                taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
+                taskItem.CreatorIdentification = (String)row["creatorID"];
+                taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
+                taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
+                taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
+
+                taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
+                taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
+                taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
+                taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
+                taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
+                taskItem.Flags         = Convert.ToUInt32(row["flags"]);
+
+                return taskItem;
+            }
+            catch
+            {
+                m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString());
+                throw;
+            }
         }
 
         private static RegionSettings BuildRegionSettings(IDataReader row)
@@ -1417,16 +1590,19 @@ namespace OpenSim.Data.MySQL
             newSettings.Covenant = DBGuid.FromDB(row["covenant"]);
             newSettings.CovenantChangedDateTime = Convert.ToInt32(row["covenant_datetime"]);
             newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
-            
+
             if (row["loaded_creation_id"] is DBNull)
                 newSettings.LoadedCreationID = "";
-            else 
+            else
                 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
 
             newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
             newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
             newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
 
+            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
+            newSettings.Casino = Convert.ToBoolean(row["casino"]);
+
             return newSettings;
         }
 
@@ -1503,6 +1679,13 @@ namespace OpenSim.Data.MySQL
 
             newData.ParcelAccessList = new List<LandAccessEntry>();
 
+            if (!(row["SeeAVs"] is System.DBNull))
+                newData.SeeAVs = Convert.ToInt32(row["SeeAVs"]) != 0 ? true : false;
+            if (!(row["AnyAVSounds"] is System.DBNull))
+                newData.AnyAVSounds = Convert.ToInt32(row["AnyAVSounds"]) != 0 ? true : false;
+            if (!(row["GroupAVSounds"] is System.DBNull))
+                newData.GroupAVSounds = Convert.ToInt32(row["GroupAVSounds"]) != 0 ? true : false;
+
             return newData;
         }
 
@@ -1550,6 +1733,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString());
             cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString());
             cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString());
+            cmd.Parameters.AddWithValue("RezzerID", prim.RezzerID.ToString());
             cmd.Parameters.AddWithValue("OwnerMask", prim.OwnerMask);
             cmd.Parameters.AddWithValue("NextOwnerMask", prim.NextOwnerMask);
             cmd.Parameters.AddWithValue("GroupMask", prim.GroupMask);
@@ -1654,6 +1838,11 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("PassTouches", 0);
 
+            if (prim.PassCollisions)
+                cmd.Parameters.AddWithValue("PassCollisions", 1);
+            else
+                cmd.Parameters.AddWithValue("PassCollisions", 0);
+
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
             if (prim.AttachedPos != null)
@@ -1668,6 +1857,16 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]);
 
+            if (prim.PhysicsInertia != null)
+                cmd.Parameters.AddWithValue("PhysInertia", prim.PhysicsInertia.ToXml2());
+            else
+                cmd.Parameters.AddWithValue("PhysInertia", String.Empty);
+
+            if (prim.VehicleParams != null)
+                cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2());
+            else
+                cmd.Parameters.AddWithValue("Vehicle", String.Empty);
+
             if (prim.DynAttrs.CountNamespaces > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
             else
@@ -1678,6 +1877,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("GravityModifier", (double)prim.GravityModifier);
             cmd.Parameters.AddWithValue("Friction", (double)prim.Friction);
             cmd.Parameters.AddWithValue("Restitution", (double)prim.Restitution);
+            cmd.Parameters.AddWithValue("RotationAxisLocks", prim.RotationAxisLocks);
         }
 
         /// <summary>
@@ -1756,6 +1956,8 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
+            cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
+            cmd.Parameters.AddWithValue("casino", settings.Casino);
 
             cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
@@ -1813,6 +2015,10 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop);
             cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic);
             cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia);
+            cmd.Parameters.AddWithValue("SeeAVs", land.SeeAVs ? 1 : 0);
+            cmd.Parameters.AddWithValue("AnyAVSounds", land.AnyAVSounds ? 1 : 0);
+            cmd.Parameters.AddWithValue("GroupAVSounds", land.GroupAVSounds ? 1 : 0);
+
         }
 
         /// <summary>
@@ -1869,7 +2075,7 @@ namespace OpenSim.Data.MySQL
 
             s.State = (byte)(int)row["State"];
             s.LastAttachPoint = (byte)(int)row["LastAttachPoint"];
-            
+
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
 
@@ -1919,7 +2125,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
-        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             lock (m_dbLock)
             {
@@ -1949,20 +2155,53 @@ namespace OpenSim.Data.MySQL
                                 "?flags, ?itemID, ?primID, ?assetID, " +
                                 "?parentFolderID, ?creatorID, ?ownerID, " +
                                 "?groupID, ?lastOwnerID)";
-    
+
                         foreach (TaskInventoryItem item in items)
                         {
                             cmd.Parameters.Clear();
-    
+
                             FillItemCommand(cmd, item);
-    
+
                             ExecuteNonQuery(cmd);
                         }
                     }
+                    dbcon.Close();
                 }
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            List<UUID> uuids = new List<UUID>();
+
+            lock (m_dbLock)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID and SceneGroupID = UUID";
+                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+
+                        using (IDataReader reader = ExecuteReader(cmd))
+                        {
+                            while (reader.Read())
+                            {
+                                UUID id = new UUID(reader["UUID"].ToString());
+
+                                uuids.Add(id);
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+
+            return uuids.ToArray();
+        }
+
         private void LoadSpawnPoints(RegionSettings rs)
         {
             rs.ClearSpawnPoints();
@@ -1992,6 +2231,7 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
         }
@@ -2026,6 +2266,7 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.Clear();
                         }
                     }
+                    dbcon.Close();
                 }
             }
         }
@@ -2045,6 +2286,7 @@ namespace OpenSim.Data.MySQL
 
                     cmd.ExecuteNonQuery();
                 }
+                dbcon.Close();
             }
         }
 
@@ -2062,6 +2304,7 @@ namespace OpenSim.Data.MySQL
 
                     cmd.ExecuteNonQuery();
                 }
+                dbcon.Close();
             }
         }
 
@@ -2085,6 +2328,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
             }
 
             return ret;
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index e964295..59cfe70 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -46,17 +46,21 @@ namespace OpenSim.Data.MySQL
         {
             string[] words = query.Split(new char[] {' '});
 
+            bool valid = false;
+
             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[i].Length > 2)
+                    valid = true;
+//                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)
+            if ((!valid) || words.Length == 0)
                 return new UserAccountData[0];
 
             if (words.Length > 2)
@@ -66,13 +70,13 @@ namespace OpenSim.Data.MySQL
             {
                 if (words.Length == 1)
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
                     cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
                     cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
                 }
                 else
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
                     cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
                     cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
                     cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
@@ -81,5 +85,21 @@ namespace OpenSim.Data.MySQL
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                if (scopeID != UUID.Zero)
+                {
+                    where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
+                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+                }
+
+                cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
+
+                return DoQuery(cmd);
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index b35595d..16637c3 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -40,39 +40,40 @@ namespace OpenSim.Data.MySQL
     public class UserProfilesData: IProfilesData
     {
         static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         #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 (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
             {
                 dbcon.Open();
-                
+
                 Migration m = new Migration(dbcon, Assembly, "UserProfiles");
                 m.Update();
+                dbcon.Close();
             }
         }
         #endregion Member Functions
-        
+
         #region Classifieds Queries
         /// <summary>
         /// Gets the classified records.
@@ -86,10 +87,10 @@ namespace OpenSim.Data.MySQL
         public OSDArray GetClassifiedRecords(UUID creatorId)
         {
             OSDArray data = new OSDArray();
-            
+
             using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
             {
-                string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
+                const string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
                 dbcon.Open();
                 using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                 {
@@ -102,7 +103,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 OSDMap n = new OSDMap();
                                 UUID Id = UUID.Zero;
-                                
+
                                 string Name = null;
                                 try
                                 {
@@ -111,8 +112,7 @@ namespace OpenSim.Data.MySQL
                                 }
                                 catch (Exception e)
                                 {
-                                    m_log.ErrorFormat("[PROFILES_DATA]" +
-                                                     ": UserAccount exception {0}", e.Message);
+                                    m_log.ErrorFormat("[PROFILES_DATA] GetClassifiedRecords exception {0}", e.Message);
                                 }
                                 n.Add("classifieduuid", OSD.FromUUID(Id));
                                 n.Add("name", OSD.FromString(Name));
@@ -121,73 +121,73 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
+                dbcon.Close();
             }
             return data;
         }
-        
+
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
         {
-            string query = string.Empty;
-            
-            
-            query += "INSERT INTO classifieds (";
-            query += "`classifieduuid`,";
-            query += "`creatoruuid`,";
-            query += "`creationdate`,";
-            query += "`expirationdate`,";
-            query += "`category`,";
-            query += "`name`,";
-            query += "`description`,";
-            query += "`parceluuid`,";
-            query += "`parentestate`,";
-            query += "`snapshotuuid`,";
-            query += "`simname`,";
-            query += "`posglobal`,";
-            query += "`parcelname`,";
-            query += "`classifiedflags`,";
-            query += "`priceforlisting`) ";
-            query += "VALUES (";
-            query += "?ClassifiedId,";
-            query += "?CreatorId,";
-            query += "?CreatedDate,";
-            query += "?ExpirationDate,";
-            query += "?Category,";
-            query += "?Name,";
-            query += "?Description,";
-            query += "?ParcelId,";
-            query += "?ParentEstate,";
-            query += "?SnapshotId,";
-            query += "?SimName,";
-            query += "?GlobalPos,";
-            query += "?ParcelName,";
-            query += "?Flags,";
-            query += "?ListingPrice ) ";
-            query += "ON DUPLICATE KEY UPDATE ";
-            query += "category=?Category, ";
-            query += "expirationdate=?ExpirationDate, ";
-            query += "name=?Name, ";
-            query += "description=?Description, ";
-            query += "parentestate=?ParentEstate, ";
-            query += "posglobal=?GlobalPos, ";
-            query += "parcelname=?ParcelName, ";
-            query += "classifiedflags=?Flags, ";
-            query += "priceforlisting=?ListingPrice, ";
-            query += "snapshotuuid=?SnapshotId";
-            
+             const string query = 
+                "INSERT INTO classifieds ("
+                + "`classifieduuid`,"
+                +  "`creatoruuid`,"
+                +  "`creationdate`,"
+                +  "`expirationdate`,"
+                +  "`category`,"
+                +  "`name`,"
+                +  "`description`,"
+                +  "`parceluuid`,"
+                +  "`parentestate`,"
+                +  "`snapshotuuid`,"
+                +  "`simname`,"
+                +  "`posglobal`,"
+                +  "`parcelname`,"
+                + "`classifiedflags`,"
+                + "`priceforlisting`) "
+                + "VALUES ("
+                + "?ClassifiedId,"
+                + "?CreatorId,"
+                + "?CreatedDate,"
+                + "?ExpirationDate,"
+                + "?Category,"
+                + "?Name,"
+                + "?Description,"
+                + "?ParcelId,"
+                + "?ParentEstate,"
+                + "?SnapshotId,"
+                + "?SimName,"
+                + "?GlobalPos,"
+                + "?ParcelName,"
+                + "?Flags,"
+                + "?ListingPrice ) "
+                + "ON DUPLICATE KEY UPDATE "
+                + "category=?Category, "
+                + "expirationdate=?ExpirationDate, "
+                + "name=?Name, "
+                + "description=?Description, "
+                + "parentestate=?ParentEstate, "
+                + "posglobal=?GlobalPos, "
+                + "parcelname=?ParcelName, "
+                + "classifiedflags=?Flags, "
+                + "priceforlisting=?ListingPrice, "
+                + "snapshotuuid=?SnapshotId"
+                ;
+
             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);
@@ -202,7 +202,7 @@ namespace OpenSim.Data.MySQL
             }
             ad.CreationDate = (int)epochnow.TotalSeconds;
             ad.ExpirationDate = (int)epochexp.TotalSeconds;
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -225,57 +225,52 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?ParcelName", ad.ParcelName.ToString());
                         cmd.Parameters.AddWithValue("?Flags", ad.Flags.ToString());
                         cmd.Parameters.AddWithValue("?ListingPrice", ad.Price.ToString ());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": ClassifiedesUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateClassifiedRecord exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
             return true;
         }
-        
+
         public bool DeleteClassifiedRecord(UUID recordId)
         {
-            string query = string.Empty;
-            
-            query += "DELETE FROM classifieds WHERE ";
-            query += "classifieduuid = ?recordId";
-            
+            const string query = "DELETE FROM classifieds WHERE classifieduuid = ?recordId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?recordId", recordId.ToString());
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": DeleteClassifiedRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: DeleteClassifiedRecord exception {0}", e.Message);
                 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";
-            
+
+            const string query = "SELECT * FROM classifieds WHERE classifieduuid = ?AdId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -284,7 +279,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?AdId", ad.ClassifiedId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.Read ())
@@ -303,7 +298,7 @@ namespace OpenSim.Data.MySQL
                                 ad.SimName = reader.GetString("simname");
                                 ad.GlobalPos = reader.GetString("posglobal");
                                 ad.ParcelName = reader.GetString("parcelname");
-                                
+
                             }
                         }
                     }
@@ -312,22 +307,19 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetClassifiedInfo exception {0}", e.Message);
             }
             return true;
         }
         #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";
+            const string query = "SELECT `pickuuid`,`name` FROM userpicks WHERE creatoruuid = ?Id";
+
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -336,7 +328,7 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
@@ -344,7 +336,7 @@ namespace OpenSim.Data.MySQL
                                 while (reader.Read())
                                 {
                                     OSDMap record = new OSDMap();
-                                    
+
                                     record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
                                     record.Add("name",OSD.FromString((string)reader["name"]));
                                     data.Add(record);
@@ -352,25 +344,21 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarPicks exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarPicks exception {0}", e.Message);
             }
             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";
-            
+            const string query = "SELECT * FROM userpicks WHERE creatoruuid = ?CreatorId AND pickuuid =  ?PickId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -380,18 +368,18 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?CreatorId", avatarId.ToString());
                         cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                
+
                                 string description = (string)reader["description"];
-                                
+
                                 if (string.IsNullOrEmpty(description))
                                     description = "No description given.";
-                                
+
                                 UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
                                 UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
                                 UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
@@ -414,42 +402,41 @@ namespace OpenSim.Data.MySQL
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": GetPickInfo exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetPickInfo exception {0}", e.Message);
             }
             return pick;
         }
-        
+
         public bool UpdatePicksRecord(UserProfilePick pick)
-        {       
-            string query = string.Empty;
-            
-            query += "INSERT INTO userpicks VALUES (";
-            query += "?PickId,";
-            query += "?CreatorId,";
-            query += "?TopPick,";
-            query += "?ParcelId,";
-            query += "?Name,";
-            query += "?Desc,";
-            query += "?SnapshotId,";
-            query += "?User,";
-            query += "?Original,";
-            query += "?SimName,";
-            query += "?GlobalPos,";
-            query += "?SortOrder,";
-            query += "?Enabled,";
-            query += "?Gatekeeper)";
-            query += "ON DUPLICATE KEY UPDATE ";
-            query += "parceluuid=?ParcelId,";
-            query += "name=?Name,";
-            query += "description=?Desc,";
-            query += "user=?User,";
-            query += "simname=?SimName,";
-            query += "snapshotuuid=?SnapshotId,";
-            query += "pickuuid=?PickId,";
-            query += "posglobal=?GlobalPos,";
-            query += "gatekeeper=?Gatekeeper";
-            
+        {
+            const string query =
+                "INSERT INTO userpicks VALUES ("
+                + "?PickId,"
+                + "?CreatorId,"
+                + "?TopPick,"
+                + "?ParcelId,"
+                + "?Name,"
+                + "?Desc,"
+                + "?SnapshotId,"
+                + "?User,"
+                + "?Original,"
+                + "?SimName,"
+                + "?GlobalPos,"
+                + "?SortOrder,"
+                + "?Enabled,"
+                + "?Gatekeeper)"
+                + "ON DUPLICATE KEY UPDATE "
+                + "parceluuid=?ParcelId,"
+                + "name=?Name,"
+                + "description=?Desc,"
+                + "user=?User,"
+                + "simname=?SimName,"
+                + "snapshotuuid=?SnapshotId,"
+                + "pickuuid=?PickId,"
+                + "posglobal=?GlobalPos,"
+                + "gatekeeper=?Gatekeeper"
+                ;
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -471,61 +458,53 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?Gatekeeper",pick.Gatekeeper);
                         cmd.Parameters.AddWithValue("?SortOrder", pick.SortOrder.ToString ());
                         cmd.Parameters.AddWithValue("?Enabled", pick.Enabled.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdatePicksRecord exception {0}", e.Message);
                 return false;
             }
             return true;
         }
-        
+
         public bool DeletePicksRecord(UUID pickId)
         {
-            string query = string.Empty;
-            
-            query += "DELETE FROM userpicks WHERE ";
-            query += "pickuuid = ?PickId";
-            
+            string query = "DELETE FROM userpicks WHERE pickuuid = ?PickId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
-                    
+
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": DeleteUserPickRecord exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: DeletePicksRecord exception {0}", e.Message);
                 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();
-            
+            const string query = "SELECT `notes` FROM usernotes WHERE useruuid = ?Id AND targetuuid = ?TargetId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -535,7 +514,7 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?Id", notes.UserId.ToString());
                         cmd.Parameters.AddWithValue("?TargetId", notes.TargetId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -549,40 +528,39 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": GetAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarNotes exception {0}", e.Message);
             }
             return true;
         }
-        
+
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
-        {          
-            string query = string.Empty;
+        {
+            string query;
             bool remove;
-            
+
             if(string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
-                query += "DELETE FROM usernotes WHERE ";
-                query += "useruuid=?UserId AND ";
-                query += "targetuuid=?TargetId";
+                query = "DELETE FROM usernotes WHERE useruuid=?UserId AND targetuuid=?TargetId";
             }
             else
             {
                 remove = false;
-                query += "INSERT INTO usernotes VALUES ( ";
-                query += "?UserId,";
-                query += "?TargetId,";
-                query += "?Notes )";
-                query += "ON DUPLICATE KEY ";
-                query += "UPDATE ";
-                query += "notes=?Notes";
+                query = "INSERT INTO usernotes VALUES (" 
+                    + "?UserId,"
+                    + "?TargetId,"
+                    + "?Notes )"
+                    + "ON DUPLICATE KEY "
+                    + "UPDATE "
+                    + "notes=?Notes"
+                    ;
             }
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -594,30 +572,27 @@ namespace OpenSim.Data.MySQL
                             cmd.Parameters.AddWithValue("?Notes", note.Notes);
                         cmd.Parameters.AddWithValue("?TargetId", note.TargetId.ToString ());
                         cmd.Parameters.AddWithValue("?UserId", note.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarNotes exception {0}", e.Message);
                 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";
-            
+            string query = "SELECT * FROM userprofile WHERE useruuid = ?Id";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -626,11 +601,13 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
-                        
+
                         using (MySqlDataReader 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"];
                                 UUID.TryParse((string)reader["profileImage"], out props.ImageId);
@@ -646,6 +623,9 @@ namespace OpenSim.Data.MySQL
                             }
                             else
                             {
+                                m_log.DebugFormat("[PROFILES_DATA]" +
+                                                 ": No data for {0}", props.UserId);
+
                                 props.WebUrl = string.Empty;
                                 props.ImageId = UUID.Zero;
                                 props.AboutText = string.Empty;
@@ -660,35 +640,36 @@ namespace OpenSim.Data.MySQL
                                 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)";
+                                query = "INSERT INTO userprofile ("
+                                    + "useruuid, "
+                                    + "profilePartner, "
+                                    + "profileAllowPublish, "
+                                    + "profileMaturePublish, "
+                                    + "profileURL, "
+                                    + "profileWantToMask, "
+                                    + "profileWantToText, "
+                                    + "profileSkillsMask, "
+                                    + "profileSkillsText, "
+                                    + "profileLanguages, "
+                                    + "profileImage, "
+                                    + "profileAboutText, "
+                                    + "profileFirstImage, "
+                                    + "profileFirstText) VALUES ("
+                                    + "?userId, "
+                                    + "?profilePartner, "
+                                    + "?profileAllowPublish, "
+                                    + "?profileMaturePublish, "
+                                    + "?profileURL, "
+                                    + "?profileWantToMask, "
+                                    + "?profileWantToText, "
+                                    + "?profileSkillsMask, "
+                                    + "?profileSkillsText, "
+                                    + "?profileLanguages, "
+                                    + "?profileImage, "
+                                    + "?profileAboutText, "
+                                    + "?profileFirstImage, "
+                                    + "?profileFirstText)"
+                                    ;
 
                                 dbcon.Close();
                                 dbcon.Open();
@@ -715,30 +696,25 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Requst properties exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetAvatarProperties exception {0}", e.Message);
                 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";
-            
+        {
+            const string query = "UPDATE userprofile SET profileURL=?profileURL,"
+                + "profileImage=?image, profileAboutText=?abouttext,"
+                + "profileFirstImage=?firstlifeimage, profileFirstText=?firstlifetext "
+                + "WHERE useruuid=?uuid";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -752,35 +728,33 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString());
                         cmd.Parameters.AddWithValue("?firstlifetext", props.FirstLifeText);
                         cmd.Parameters.AddWithValue("?uuid", props.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarProperties exception {0}", e.Message);
+
                 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";
-            
+        {
+            const string query = "UPDATE userprofile SET "
+                + "profileWantToMask=?WantMask, "
+                + "profileWantToText=?WantText,"
+                + "profileSkillsMask=?SkillsMask,"
+                + "profileSkillsText=?SkillsText, "
+                + "profileLanguages=?Languages "
+                + "WHERE useruuid=?uuid";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -794,15 +768,14 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?SkillsText", up.SkillsText);
                         cmd.Parameters.AddWithValue("?Languages", up.Language);
                         cmd.Parameters.AddWithValue("?uuid", up.UserId.ToString());
-                        
+
                         cmd.ExecuteNonQuery();
                     }
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateAvatarInterests exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -813,21 +786,20 @@ namespace OpenSim.Data.MySQL
         public OSDArray GetUserImageAssets(UUID avatarId)
         {
             OSDArray data = new OSDArray();
-            string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
+            const string queryA = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
 
             // Get classified image assets
-            
-            
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
                 {
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`classifieds`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryA,"`classifieds`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -843,10 +815,10 @@ namespace OpenSim.Data.MySQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryA,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -858,16 +830,16 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    
+
                     dbcon.Close();
                     dbcon.Open();
 
-                    query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
+                    const string queryB = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
 
-                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (queryB,"`userpicks`"), dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -880,27 +852,21 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                  ": GetAvatarNotes exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserImageAssets exception {0}", e.Message);
             }
             return data;
         }
-        
+
         #region User Preferences
         public bool GetUserPreferences(ref UserPreferences pref, ref string result)
         {
-            string query = string.Empty;
-            
-            query += "SELECT imviaemail,visible,email FROM ";
-            query += "usersettings WHERE ";
-            query += "useruuid = ?Id";
-            
-            OSDArray data = new OSDArray();
-            
+            const string query = "SELECT imviaemail,visible,email FROM usersettings WHERE useruuid = ?Id";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -909,10 +875,9 @@ namespace OpenSim.Data.MySQL
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
                         cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
-                        
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
-                            if(reader.HasRows)
+                            if (reader.HasRows)
                             {
                                 reader.Read();
                                 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
@@ -923,13 +888,12 @@ namespace OpenSim.Data.MySQL
                             {
                                 dbcon.Close();
                                 dbcon.Open();
-                                
-                                query = "INSERT INTO usersettings VALUES ";
-                                query += "(?uuid,'false','false', ?Email)";
 
-                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                const string queryB = "INSERT INTO usersettings VALUES (?uuid,'false','false', ?Email)";
+
+                                using (MySqlCommand put = new MySqlCommand(queryB, dbcon))
                                 {
-                                    
+
                                     put.Parameters.AddWithValue("?Email", pref.EMail);
                                     put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
 
@@ -938,28 +902,24 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Get preferences exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserPreferences exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
             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";
-            
+        {
+            const string query = "UPDATE usersettings SET imviaemail=?ImViaEmail," 
+                + "visible=?Visible, email=?EMail "
+                + "WHERE useruuid=?uuid";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -974,28 +934,24 @@ namespace OpenSim.Data.MySQL
 
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                    ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
+                m_log.ErrorFormat("[PROFILES_DATA]: UpdateUserPreferences exception {0} {1}", e.Message, e.InnerException);
                 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";
-            
+            const string query = "SELECT * FROM `userdata` WHERE UserId = ?Id AND TagId = ?TagId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -1005,7 +961,7 @@ namespace OpenSim.Data.MySQL
                     {
                         cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
                         cmd.Parameters.AddWithValue ("?TagId", props.TagId.ToString());
-                        
+
                         using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
                             if(reader.HasRows)
@@ -1016,13 +972,8 @@ namespace OpenSim.Data.MySQL
                             }
                             else
                             {
-                                query += "INSERT INTO userdata VALUES ( ";
-                                query += "?UserId,";
-                                query += "?TagId,";
-                                query += "?DataKey,";
-                                query +=  "?DataVal) ";
-                                
-                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                const string queryB = "INSERT INTO userdata VALUES (?UserId, ?TagId, ?DataKey, ?DataVal)";
+                                using (MySqlCommand put = new MySqlCommand(queryB, dbcon))
                                 {
                                     put.Parameters.AddWithValue("?UserId", props.UserId.ToString());
                                     put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
@@ -1034,12 +985,12 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": Requst application data exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: GetUserAppData exception {0}", e.Message);
                 result = e.Message;
                 return false;
             }
@@ -1047,16 +998,9 @@ namespace OpenSim.Data.MySQL
         }
 
         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";
-            
+        {
+            const string query = "UPDATE userdata SET TagId = ?TagId, DataKey = ?DataKey, DataVal = ?DataVal WHERE UserId = ?UserId AND TagId = ?TagId";
+
             try
             {
                 using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
@@ -1071,12 +1015,12 @@ namespace OpenSim.Data.MySQL
 
                         cmd.ExecuteNonQuery();
                     }
+                    dbcon.Close();
                 }
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[PROFILES_DATA]" +
-                                 ": SetUserData exception {0}", e.Message);
+                m_log.ErrorFormat("[PROFILES_DATA]: SetUserAppData exception {0}", e.Message);
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index af7e876..9f9c9cf 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -97,6 +97,7 @@ namespace OpenSim.Data.MySQL
                 dbcon.Open();
                 Migration m = new Migration(dbcon, Assembly, "XAssetStore");
                 m.Update();
+                dbcon.Close();
             }
         }
 
@@ -130,6 +131,7 @@ namespace OpenSim.Data.MySQL
 //            m_log.DebugFormat("[MYSQL XASSET DATA]: Looking for asset {0}", assetID);
 
             AssetBase asset = null;
+            int accessTime = 0;
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -140,7 +142,6 @@ namespace OpenSim.Data.MySQL
                     dbcon))
                 {
                     cmd.Parameters.AddWithValue("?ID", assetID.ToString());
-
                     try
                     {
                         using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
@@ -159,23 +160,7 @@ namespace OpenSim.Data.MySQL
 
                                 asset.Temporary = Convert.ToBoolean(dbReader["Temporary"]);
                                 asset.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
-
-                                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["AccessTime"]);
+                                accessTime = (int)dbReader["AccessTime"];
                             }
                         }
                     }
@@ -184,9 +169,38 @@ namespace OpenSim.Data.MySQL
                         m_log.Error(string.Format("[MYSQL XASSET DATA]: Failure fetching asset {0}", assetID), e);
                     }
                 }
+                dbcon.Close();
             }
 
-            return asset;
+            if(asset == null)
+                return asset;
+
+            if(accessTime > 0)
+            {
+                try
+                {
+                    UpdateAccessTime(asset.Metadata, accessTime);
+                }
+                catch { }
+            }
+
+            if (m_enableCompression && asset.Data != null)
+            {
+                using(MemoryStream ms = new MemoryStream(asset.Data))
+                using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
+                {
+                    using(MemoryStream outputStream = new MemoryStream())
+                    {
+                        decompressionStream.CopyTo(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);
+                }                             
+            }
+        return asset;
         }
 
         /// <summary>
@@ -209,7 +223,7 @@ namespace OpenSim.Data.MySQL
                     {
                         assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                         m_log.WarnFormat(
-                            "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                             asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                     }
 
@@ -218,7 +232,7 @@ namespace OpenSim.Data.MySQL
                     {
                         assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                         m_log.WarnFormat(
-                            "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                            "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                             asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                     }
 
@@ -303,6 +317,7 @@ namespace OpenSim.Data.MySQL
 
                     transaction.Commit();
                 }
+                dbcon.Close();
             }
         }
 
@@ -341,9 +356,10 @@ namespace OpenSim.Data.MySQL
                 catch (Exception)
                 {
                     m_log.ErrorFormat(
-                        "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 
+                        "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}",
                         assetMetadata.ID, assetMetadata.Name);
                 }
+                dbcon.Close();
             }
         }
 
@@ -440,38 +456,41 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-                MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count", dbcon);
-                cmd.Parameters.AddWithValue("?start", start);
-                cmd.Parameters.AddWithValue("?count", count);
-
-                try
+                using(MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count",dbcon))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                    cmd.Parameters.AddWithValue("?start",start);
+                    cmd.Parameters.AddWithValue("?count", count);
+
+                    try
                     {
-                        while (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
-                            AssetMetadata metadata = new AssetMetadata();
-                            metadata.Name = (string)dbReader["Name"];
-                            metadata.Description = (string)dbReader["Description"];
-                            metadata.Type = (sbyte)dbReader["AssetType"];
-                            metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
-                            metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
-                            metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
-                            metadata.CreatorID = dbReader["CreatorID"].ToString();
+                            while (dbReader.Read())
+                            {
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["Name"];
+                                metadata.Description = (string)dbReader["Description"];
+                                metadata.Type = (sbyte)dbReader["AssetType"];
+                                metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
 
-                            // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
+                                // We'll ignore this for now - it appears unused!
+    //                                metadata.SHA1 = dbReader["hash"]);
 
-                            UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
+                                UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
 
-                            retList.Add(metadata);
+                                retList.Add(metadata);
+                            }
                         }
                     }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                    }
                 }
-                catch (Exception e)
-                {
-                    m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
-                }
+                dbcon.Close();
             }
 
             return retList;
@@ -490,9 +509,9 @@ namespace OpenSim.Data.MySQL
                     cmd.Parameters.AddWithValue("?ID", id);
                     cmd.ExecuteNonQuery();
                 }
-
                 // TODO: How do we deal with data from deleted assets?  Probably not easily reapable unless we
                 // keep a reference count (?)
+                dbcon.Close();
             }
 
             return true;
@@ -500,4 +519,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index c74033e..5019994 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Data.MySQL
 
             return m_Items.Store(item);
         }
-        
+
         public bool DeleteFolders(string field, string val)
         {
             return m_Folders.Delete(field, val);
@@ -193,7 +193,9 @@ namespace OpenSim.Data.MySQL
         {
             using (MySqlCommand cmd  = new MySqlCommand())
             {
-                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);
+
+                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1");
 
                 cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
                 cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
@@ -212,15 +214,18 @@ namespace OpenSim.Data.MySQL
                 {
                     cmd.Connection = dbcon;
 
-                    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 from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
+
+                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID");
+
                     cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
                     cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
-                
+
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
 
                         int perms = 0;
-                    
+
                         if (reader.Read())
                         {
                             perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
@@ -323,7 +328,6 @@ namespace OpenSim.Data.MySQL
                     {
                         return false;
                     }
-                    cmd.Dispose();
                 }
 
                 dbcon.Close();
diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
index b46d175..6507a37 100644
--- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
@@ -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.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
diff --git a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
index e76db07..e496f72 100644
--- a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
+++ b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
@@ -13,6 +13,6 @@ CREATE TABLE `AgentPrefs` (
     `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
     UNIQUE KEY `PrincipalID` (`PrincipalID`),
     PRIMARY KEY(`PrincipalID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index 52715fd..820799d 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -1,81 +1,21 @@
 # -----------------
-:VERSION 1
+:VERSION 10
 
 BEGIN;
 
-CREATE TABLE `assets` (
-  `id` binary(16) NOT NULL,
+CREATE TABLE IF NOT EXISTS `assets` (
   `name` varchar(64) NOT NULL,
   `description` varchar(64) NOT NULL,
   `assetType` tinyint(4) NOT NULL,
-  `invType` tinyint(4) NOT NULL,
   `local` tinyint(1) NOT NULL,
   `temporary` tinyint(1) NOT NULL,
   `data` longblob NOT NULL,
+  `id` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `create_time` int(11) DEFAULT '0',
+  `access_time` int(11) DEFAULT '0',
+  `asset_flags` int(11) NOT NULL DEFAULT '0',
+  `CreatorID` varchar(128) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
-
-# -----------------
-:VERSION 2
-
-BEGIN;
-
-ALTER TABLE assets change id oldid binary(16);
-ALTER TABLE assets add id varchar(36) not null default '';
-UPDATE assets set id = concat(substr(hex(oldid),1,8),"-",substr(hex(oldid),9,4),"-",substr(hex(oldid),13,4),"-",substr(hex(oldid),17,4),"-",substr(hex(oldid),21,12));
-ALTER TABLE assets drop oldid;
-ALTER TABLE assets add constraint primary key(id);
-
-COMMIT;
-
-# -----------------
-:VERSION 3
-
-BEGIN;
-
-ALTER TABLE assets change id oldid varchar(36);
-ALTER TABLE assets add id char(36) not null default '00000000-0000-0000-0000-000000000000';
-UPDATE assets set id = oldid;
-ALTER TABLE assets drop oldid;
-ALTER TABLE assets add constraint primary key(id);
-
-COMMIT;
-
-# -----------------
-:VERSION 4
-
-BEGIN;
-
-ALTER TABLE assets drop InvType;
-
-COMMIT;
-
-# -----------------
-:VERSION 5
-
-BEGIN;
-
-ALTER TABLE assets add create_time integer default 0;
-ALTER TABLE assets add access_time integer default 0;
-
-COMMIT;
-
-# -----------------
-:VERSION 6
-
-DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621'
-
-:VERSION 7
-
-ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
-
-:VERSION 8
-
-ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
-
-:VERSION 9
-
-BEGIN;
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index 9450940..f00979f 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -1,16 +1,17 @@
-:VERSION 1         # -------------------------------
+:VERSION 4         # -------------------------------
 
 begin;
 
-CREATE TABLE `auth` (
+CREATE TABLE IF NOT EXISTS `auth` (
   `UUID` char(36) NOT NULL,
-  `passwordHash` char(32) NOT NULL default '',
-  `passwordSalt` char(32) NOT NULL default '',
-  `webLoginKey` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM;
-
-CREATE TABLE `tokens` (
+  `passwordHash` char(32) NOT NULL DEFAULT '',
+  `passwordSalt` char(32) NOT NULL DEFAULT '',
+  `webLoginKey` varchar(255) NOT NULL DEFAULT '',
+  `accountType` varchar(32) NOT NULL DEFAULT 'UserAccount',
+  PRIMARY KEY (`UUID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `tokens` (
   `UUID` char(36) NOT NULL,
   `token` varchar(255) NOT NULL,
   `validity` datetime NOT NULL,
@@ -18,22 +19,6 @@ CREATE TABLE `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=MyISAM;
-
-commit;
-
-:VERSION 2         # -------------------------------
-
-BEGIN;
-
-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey) SELECT `UUID` AS UUID, `passwordHash` AS passwordHash, `passwordSalt` AS passwordSalt, `webLoginKey` AS webLoginKey FROM users;
-
-COMMIT;
-
-:VERSION 3         # -------------------------------
-
-BEGIN;
-
-ALTER TABLE `auth` ADD COLUMN `accountType` VARCHAR(32) NOT NULL DEFAULT 'UserAccount';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/Avatar.migrations b/OpenSim/Data/MySQL/Resources/Avatar.migrations
index f7cf176..c5ec9ca 100644
--- a/OpenSim/Data/MySQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MySQL/Resources/Avatar.migrations
@@ -1,20 +1,13 @@
-:VERSION 1
+:VERSION 3
 
 BEGIN;
 
-CREATE TABLE Avatars (
-        PrincipalID CHAR(36) NOT NULL, 
-        Name VARCHAR(32) NOT NULL, 
-        Value VARCHAR(255) NOT NULL DEFAULT '', 
-        PRIMARY KEY(PrincipalID, Name), 
-        KEY(PrincipalID));
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN;
-
-alter table Avatars change column Value Value text;
+CREATE TABLE IF NOT EXISTS `Avatars` (
+  `PrincipalID` char(36) NOT NULL,
+  `Name` varchar(32) NOT NULL,
+  `Value` text,
+  PRIMARY KEY (`PrincipalID`,`Name`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 9dfb77b..615af95 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -1,41 +1,29 @@
-:VERSION 13
-
-# The estate migrations used to be in Region store
-# here they will do nothing (bad) if the tables are already there, 
-# just update the store version.
+:VERSION 34
 
 BEGIN;
 
-CREATE TABLE IF NOT EXISTS `estate_managers` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
-
 CREATE TABLE IF NOT EXISTS `estate_groups` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `estate_users` (
+CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `estateban` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `bannedUUID` varchar(36) NOT NULL,
-  `bannedIp` varchar(16) NOT NULL,
-  `bannedIpHostMask` varchar(16) NOT NULL,
-  `bannedNameMask` varchar(64) default NULL,
-  KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+CREATE TABLE IF NOT EXISTS `estate_map` (
+  `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `EstateID` int(11) NOT NULL,
+  PRIMARY KEY (`RegionID`),
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
-  `EstateID` int(10) unsigned NOT NULL auto_increment,
-  `EstateName` varchar(64) default NULL,
+  `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `EstateName` varchar(64) DEFAULT NULL,
   `AbuseEmailToEstateOwner` tinyint(4) NOT NULL,
   `DenyAnonymous` tinyint(4) NOT NULL,
   `ResetHomeOnTeleport` tinyint(4) NOT NULL,
@@ -55,33 +43,29 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateSkipScripts` tinyint(4) NOT NULL,
   `BillableFactor` float NOT NULL,
   `PublicAccess` tinyint(4) NOT NULL,
-  `AbuseEmail` varchar(255) not null,
-  `EstateOwner` varchar(36) not null,
-  `DenyMinors` tinyint not null,
-  
-  PRIMARY KEY  (`EstateID`)
-) ENGINE=MyISAM AUTO_INCREMENT=100;
+  `AbuseEmail` varchar(255) NOT NULL,
+  `EstateOwner` varchar(36) NOT NULL,
+  `DenyMinors` tinyint(4) NOT NULL,
+  `AllowLandmark` tinyint(4) NOT NULL DEFAULT '1',
+  `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1',
+  `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`EstateID`)
+) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
 
-CREATE TABLE IF NOT EXISTS `estate_map` (
-  `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
-  `EstateID` int(11) NOT NULL,
-  PRIMARY KEY  (`RegionID`),
+CREATE TABLE IF NOT EXISTS `estate_users` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-COMMIT;
-
-:VERSION 32                     #--------------------- (moved from RegionStore migr, just in case)
-
-BEGIN;
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
-
-:VERSION 33                     #--------------------- 
+CREATE TABLE IF NOT EXISTS `estateban` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `bannedUUID` varchar(36) NOT NULL,
+  `bannedIp` varchar(16) NOT NULL,
+  `bannedIpHostMask` varchar(16) NOT NULL,
+  `bannedNameMask` varchar(64) DEFAULT NULL,
+  KEY `estateban_EstateID` (`EstateID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-BEGIN;
-ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
-ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
-ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
index 4194af3..87d08c6 100644
--- a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
@@ -13,6 +13,6 @@ CREATE TABLE `fsassets` (
   `access_time` int(11) NOT NULL DEFAULT '0',
   `asset_flags` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 5de0e35..6840f07 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -1,32 +1,14 @@
-:VERSION 1       # -------------------------
+:VERSION 4       # -------------------------
 
 BEGIN;
 
-CREATE TABLE `Friends` (
-        `PrincipalID` CHAR(36) NOT NULL, 
-        `Friend` VARCHAR(255) NOT NULL, 
-        `Flags` VARCHAR(16) NOT NULL DEFAULT 0, 
-        `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
-        PRIMARY KEY(`PrincipalID`, `Friend`), 
-        KEY(`PrincipalID`)
-) ENGINE=MyISAM;
-
-COMMIT;
-
-:VERSION 2       # -------------------------
-
-BEGIN;
-
-INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
-
-COMMIT;
-
-:VERSION 3       # -------------------------
-
-BEGIN;
-
-ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-ALTER TABLE `Friends` DROP PRIMARY KEY;
-ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36));
+CREATE TABLE IF NOT EXISTS `Friends` (
+  `PrincipalID` varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `Friend` varchar(255) NOT NULL,
+  `Flags` varchar(16) NOT NULL DEFAULT '0',
+  `Offered` varchar(32) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`PrincipalID`(36),`Friend`(36)),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index 52ced24..e4c8fc3 100644
--- a/OpenSim/Data/MySQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -1,109 +1,52 @@
-:VERSION 1
+:VERSION 10
 
 BEGIN;
 
-CREATE TABLE `regions` (
+CREATE TABLE IF NOT EXISTS `regions` (
   `uuid` varchar(36) NOT NULL,
   `regionHandle` bigint(20) unsigned NOT NULL,
-  `regionName` varchar(32) default NULL,
-  `regionRecvKey` varchar(128) default NULL,
-  `regionSendKey` varchar(128) default NULL,
-  `regionSecret` varchar(128) default NULL,
-  `regionDataURI` varchar(255) default NULL,
-  `serverIP` varchar(64) default NULL,
-  `serverPort` int(10) unsigned default NULL,
-  `serverURI` varchar(255) default NULL,
-  `locX` int(10) unsigned default NULL,
-  `locY` int(10) unsigned default NULL,
-  `locZ` int(10) unsigned default NULL,
-  `eastOverrideHandle` bigint(20) unsigned default NULL,
-  `westOverrideHandle` bigint(20) unsigned default NULL,
-  `southOverrideHandle` bigint(20) unsigned default NULL,
-  `northOverrideHandle` bigint(20) unsigned default NULL,
-  `regionAssetURI` varchar(255) default NULL,
-  `regionAssetRecvKey` varchar(128) default NULL,
-  `regionAssetSendKey` varchar(128) default NULL,
-  `regionUserURI` varchar(255) default NULL,
-  `regionUserRecvKey` varchar(128) default NULL,
-  `regionUserSendKey` varchar(128) default NULL, `regionMapTexture` varchar(36) default NULL,
-  `serverHttpPort` int(10) default NULL, `serverRemotingPort` int(10) default NULL,
-  `owner_uuid` varchar(36) default '00000000-0000-0000-0000-000000000000' not null,
-  `originUUID` varchar(36),
-  PRIMARY KEY  (`uuid`),
+  `regionName` varchar(128) DEFAULT NULL,
+  `regionRecvKey` varchar(128) DEFAULT NULL,
+  `regionSendKey` varchar(128) DEFAULT NULL,
+  `regionSecret` varchar(128) DEFAULT NULL,
+  `regionDataURI` varchar(255) DEFAULT NULL,
+  `serverIP` varchar(64) DEFAULT NULL,
+  `serverPort` int(10) unsigned DEFAULT NULL,
+  `serverURI` varchar(255) DEFAULT NULL,
+  `locX` int(10) unsigned DEFAULT NULL,
+  `locY` int(10) unsigned DEFAULT NULL,
+  `locZ` int(10) unsigned DEFAULT NULL,
+  `eastOverrideHandle` bigint(20) unsigned DEFAULT NULL,
+  `westOverrideHandle` bigint(20) unsigned DEFAULT NULL,
+  `southOverrideHandle` bigint(20) unsigned DEFAULT NULL,
+  `northOverrideHandle` bigint(20) unsigned DEFAULT NULL,
+  `regionAssetURI` varchar(255) DEFAULT NULL,
+  `regionAssetRecvKey` varchar(128) DEFAULT NULL,
+  `regionAssetSendKey` varchar(128) DEFAULT NULL,
+  `regionUserURI` varchar(255) DEFAULT NULL,
+  `regionUserRecvKey` varchar(128) DEFAULT NULL,
+  `regionUserSendKey` varchar(128) DEFAULT NULL,
+  `regionMapTexture` varchar(36) DEFAULT NULL,
+  `serverHttpPort` int(10) DEFAULT NULL,
+  `serverRemotingPort` int(10) DEFAULT NULL,
+  `owner_uuid` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `originUUID` varchar(36) DEFAULT NULL,
+  `access` int(10) unsigned DEFAULT '1',
+  `ScopeID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `sizeX` int(11) NOT NULL DEFAULT '0',
+  `sizeY` int(11) NOT NULL DEFAULT '0',
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `last_seen` int(11) NOT NULL DEFAULT '0',
+  `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `Token` varchar(255) NOT NULL,
+  `parcelMapTexture` varchar(36) DEFAULT NULL,
+  PRIMARY KEY (`uuid`),
   KEY `regionName` (`regionName`),
   KEY `regionHandle` (`regionHandle`),
-  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN;
-
-ALTER TABLE regions add column access integer unsigned default 1;
-
-COMMIT;
-
-:VERSION 3
-
-BEGIN;
-
-ALTER TABLE regions add column ScopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-create index ScopeID on regions(ScopeID);
-
-COMMIT;
-
-:VERSION 4
-
-BEGIN;
-
-ALTER TABLE regions add column sizeX integer not null default 0;
-ALTER TABLE regions add column sizeY integer not null default 0;
-
-COMMIT;
-
-:VERSION 5
-
-BEGIN;
-
-ALTER TABLE `regions` ADD COLUMN `flags` integer NOT NULL DEFAULT 0;
-CREATE INDEX flags ON regions(flags);
-
-COMMIT;
-
-:VERSION 6
-
-BEGIN;
-
-ALTER TABLE `regions` ADD COLUMN `last_seen` integer NOT NULL DEFAULT 0;
-
-COMMIT;
-
-:VERSION 7
-
-BEGIN;
-
-ALTER TABLE `regions` ADD COLUMN `PrincipalID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-ALTER TABLE `regions` ADD COLUMN `Token` varchar(255) NOT NULL;
-
-COMMIT;
-
-
-:VERSION 8              # ------------
-
-BEGIN;
-
-alter table regions modify column regionName varchar(128) default NULL;
-
-COMMIT;
-
-:VERSION 9      # ------------
-
-BEGIN;
-
-alter table regions add column `parcelMapTexture` varchar(36) default NULL;
+  KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`),
+  KEY `ScopeID` (`ScopeID`),
+  KEY `flags` (`flags`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index e2be27e..d08e096 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -14,7 +14,7 @@ CREATE TABLE `GridUser` (
     `Login` CHAR(16) NOT NULL DEFAULT '0',
     `Logout` CHAR(16) NOT NULL DEFAULT '0',
     PRIMARY KEY  (`UserID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
index 06ca29d..b4e4422 100644
--- a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -12,7 +12,7 @@ CREATE TABLE `hg_traveling_data` (
     `TMStamp` timestamp NOT NULL,
     PRIMARY KEY  (`SessionID`),
         KEY (`UserID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
index 79ead98..4f14826 100644
--- a/OpenSim/Data/MySQL/Resources/IM_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
@@ -1,42 +1,16 @@
-:VERSION 1         # -------------------------- 
+:VERSION 5         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE `im_offline` (
-  `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
-  `PrincipalID` char(36) NOT NULL default '',
+CREATE TABLE IF NOT EXISTS `im_offline` (
+  `ID` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `PrincipalID` char(36) NOT NULL DEFAULT '',
+  `FromID` char(36) NOT NULL DEFAULT '',
   `Message` text NOT NULL,
-  `TMStamp` timestamp NOT NULL,
-  PRIMARY KEY  (`ID`),
-  KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM;
-
-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;
-
-ALTER TABLE `im_offline`
-  ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
-  ADD KEY `FromID` (`FromID`);
-
-COMMIT;
-
-:VERSION 4         # -------------------------- 
-
-BEGIN;
-
-ALTER TABLE im_offline CONVERT TO CHARACTER SET utf8;
+  `TMStamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`ID`),
+  KEY `PrincipalID` (`PrincipalID`),
+  KEY `FromID` (`FromID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
index ca2fe11..2d4384c 100644
--- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -1,109 +1,42 @@
-:VERSION 1           # ------------
+:VERSION 7           # ------------
 BEGIN;
 
-CREATE TABLE `inventoryfolders` (
-  `folderID` varchar(36) NOT NULL default '',
-  `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,
-  PRIMARY KEY  (`folderID`),
-  KEY `owner` (`agentID`),
-  KEY `parent` (`parentFolderID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE `inventoryitems` (
-  `inventoryID` varchar(36) NOT NULL default '',
-  `assetID` varchar(36) default NULL,
-  `assetType` int(11) default NULL,
-  `parentFolderID` varchar(36) default NULL,
-  `avatarID` varchar(36) default NULL,
-  `inventoryName` varchar(64) default NULL,
-  `inventoryDescription` varchar(128) default NULL,
-  `inventoryNextPermissions` int(10) unsigned default NULL,
-  `inventoryCurrentPermissions` int(10) unsigned default NULL,
-  `invType` int(11) default NULL,
-  `creatorID` varchar(36) default NULL,
-  `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
-  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
-  `salePrice` int(11) NOT NULL default 0,
-  `saleType` tinyint(4) NOT NULL default 0,
-  `creationDate` int(11) NOT NULL default 0,
-  `groupID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
-  `groupOwned` tinyint(4) NOT NULL default 0,
-  `flags` int(11) unsigned NOT NULL default 0,
-  PRIMARY KEY  (`inventoryID`),
-  KEY `owner` (`avatarID`),
-  KEY `folder` (`parentFolderID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-COMMIT;
-
-:VERSION 2              # ------------
-
-BEGIN;
-
-ALTER TABLE inventoryfolders change folderID folderIDold varchar(36);
-ALTER TABLE inventoryfolders change agentID agentIDold varchar(36);
-ALTER TABLE inventoryfolders change parentFolderID parentFolderIDold varchar(36);
-ALTER TABLE inventoryfolders add folderID char(36) not null default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE inventoryfolders add agentID char(36) default NULL;
-ALTER TABLE inventoryfolders add parentFolderID char(36) default NULL;
-UPDATE inventoryfolders set folderID = folderIDold, agentID = agentIDold, parentFolderID = parentFolderIDold;
-ALTER TABLE inventoryfolders drop folderIDold;
-ALTER TABLE inventoryfolders drop agentIDold;
-ALTER TABLE inventoryfolders drop parentFolderIDold;
-ALTER TABLE inventoryfolders add constraint primary key(folderID);
-ALTER TABLE inventoryfolders add index inventoryfolders_agentid(agentID);
-ALTER TABLE inventoryfolders add index inventoryfolders_parentFolderid(parentFolderID);
-
-ALTER TABLE inventoryitems change inventoryID inventoryIDold varchar(36);
-ALTER TABLE inventoryitems change avatarID avatarIDold varchar(36);
-ALTER TABLE inventoryitems change parentFolderID parentFolderIDold varchar(36);
-ALTER TABLE inventoryitems add inventoryID char(36) not null default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE inventoryitems add avatarID char(36) default NULL;
-ALTER TABLE inventoryitems add parentFolderID char(36) default NULL;
-UPDATE inventoryitems set inventoryID = inventoryIDold, avatarID = avatarIDold, parentFolderID = parentFolderIDold;
-ALTER TABLE inventoryitems drop inventoryIDold;
-ALTER TABLE inventoryitems drop avatarIDold;
-ALTER TABLE inventoryitems drop parentFolderIDold;
-ALTER TABLE inventoryitems add constraint primary key(inventoryID);
-ALTER TABLE inventoryitems add index inventoryitems_avatarid(avatarID);
-ALTER TABLE inventoryitems add index inventoryitems_parentFolderid(parentFolderID);
-
-COMMIT;
-
-:VERSION 3              # ------------
-
-BEGIN;
-
-alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
-
-COMMIT;
-
-:VERSION 4              # ------------
-
-BEGIN;
-
-update inventoryitems set creatorID = '00000000-0000-0000-0000-000000000000' where creatorID is NULL;
-update inventoryitems set creatorID = '00000000-0000-0000-0000-000000000000' where creatorID = '';
-alter table inventoryitems modify column creatorID varchar(36) not NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 5              # ------------
-
-BEGIN;
-
-alter table inventoryitems modify column creatorID varchar(128) not NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 6              # ------------
-
-BEGIN;
-
-alter table inventoryitems modify column creatorID varchar(255) not NULL default '00000000-0000-0000-0000-000000000000';
+CREATE TABLE IF NOT EXISTS `inventoryitems` (
+  `assetID` varchar(36) DEFAULT NULL,
+  `assetType` int(11) DEFAULT NULL,
+  `inventoryName` varchar(64) DEFAULT NULL,
+  `inventoryDescription` varchar(128) DEFAULT NULL,
+  `inventoryNextPermissions` int(10) unsigned DEFAULT NULL,
+  `inventoryCurrentPermissions` int(10) unsigned DEFAULT NULL,
+  `invType` int(11) DEFAULT NULL,
+  `creatorID` varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `inventoryBasePermissions` int(10) unsigned NOT NULL DEFAULT '0',
+  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL DEFAULT '0',
+  `salePrice` int(11) NOT NULL DEFAULT '0',
+  `saleType` tinyint(4) NOT NULL DEFAULT '0',
+  `creationDate` int(11) NOT NULL DEFAULT '0',
+  `groupID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `groupOwned` tinyint(4) NOT NULL DEFAULT '0',
+  `flags` int(11) unsigned NOT NULL DEFAULT '0',
+  `inventoryID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `avatarID` char(36) DEFAULT NULL,
+  `parentFolderID` char(36) DEFAULT NULL,
+  `inventoryGroupPermissions` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`inventoryID`),
+  KEY `inventoryitems_avatarid` (`avatarID`),
+  KEY `inventoryitems_parentFolderid` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `inventoryfolders` (
+  `folderName` varchar(64) DEFAULT NULL,
+  `type` smallint(6) NOT NULL DEFAULT '0',
+  `version` int(11) NOT NULL DEFAULT '0',
+  `folderID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `agentID` char(36) DEFAULT NULL,
+  `parentFolderID` char(36) DEFAULT NULL,
+  PRIMARY KEY (`folderID`),
+  KEY `inventoryfolders_agentid` (`agentID`),
+  KEY `inventoryfolders_parentFolderid` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/LogStore.migrations b/OpenSim/Data/MySQL/Resources/LogStore.migrations
index b572411..9ac26ac 100644
--- a/OpenSim/Data/MySQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -10,4 +10,4 @@ CREATE TABLE `logs` (
   `priority` int(11) default NULL,
   `message` text,
   PRIMARY KEY  (`logID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/OpenSim/Data/MySQL/Resources/MuteListStore.migrations b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations
new file mode 100644
index 0000000..5bde63e
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/MuteListStore.migrations
@@ -0,0 +1,16 @@
+:VERSION 1
+
+BEGIN;
+
+CREATE TABLE `MuteList` (
+  `AgentID` char(36) NOT NULL,
+  `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `MuteName` varchar(64) NOT NULL DEFAULT '',
+  `MuteType` int(11) NOT NULL DEFAULT '1',
+  `MuteFlags` int(11) NOT NULL DEFAULT '0',
+  `Stamp` int(11) NOT NULL,
+  UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
+  KEY `AgentID` (`AgentID`)
+);
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index 6dc9384..50aa756 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -1,31 +1,16 @@
-:VERSION 1         # -------------------------- 
+:VERSION 4         # -------------------------- 
 
 BEGIN;
 
-CREATE TABLE `Presence` (
-    `UserID` VARCHAR(255) NOT NULL,
-    `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
-    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
-) ENGINE=MyISAM;
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT;
-
-:VERSION 2         # -------------------------- 
-
-BEGIN;
-
-ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp;
-
-COMMIT;
-
-:VERSION 3         # -------------------------- 
-
-BEGIN;
-
-CREATE INDEX RegionID ON Presence(RegionID);
+CREATE TABLE IF NOT EXISTS `Presence` (
+  `UserID` varchar(255) NOT NULL,
+  `RegionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `SessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `SecureSessionID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `LastSeen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  UNIQUE KEY `SessionID` (`SessionID`),
+  KEY `UserID` (`UserID`),
+  KEY `RegionID` (`RegionID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 834d249..0577392 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -1,354 +1,226 @@
 
-:VERSION 1              #---------------------
-
-BEGIN;
-
-CREATE TABLE `prims` (
-  `UUID` varchar(255) NOT NULL,
-  `RegionUUID` varchar(255) default NULL,
-  `ParentID` int(11) default NULL,
-  `CreationDate` int(11) default NULL,
-  `Name` varchar(255) default NULL,
-  `SceneGroupID` varchar(255) default NULL,
-  `Text` varchar(255) default NULL,
-  `Description` varchar(255) default NULL,
-  `SitName` varchar(255) default NULL,
-  `TouchName` varchar(255) default NULL,
-  `ObjectFlags` int(11) default NULL,
-  `CreatorID` varchar(255) default NULL,
-  `OwnerID` varchar(255) default NULL,
-  `GroupID` varchar(255) default NULL,
-  `LastOwnerID` varchar(255) default NULL,
-  `OwnerMask` int(11) default NULL,
-  `NextOwnerMask` int(11) default NULL,
-  `GroupMask` int(11) default NULL,
-  `EveryoneMask` int(11) default NULL,
-  `BaseMask` int(11) default NULL,
-  `PositionX` float default NULL,
-  `PositionY` float default NULL,
-  `PositionZ` float default NULL,
-  `GroupPositionX` float default NULL,
-  `GroupPositionY` float default NULL,
-  `GroupPositionZ` float default NULL,
-  `VelocityX` float default NULL,
-  `VelocityY` float default NULL,
-  `VelocityZ` float default NULL,
-  `AngularVelocityX` float default NULL,
-  `AngularVelocityY` float default NULL,
-  `AngularVelocityZ` float default NULL,
-  `AccelerationX` float default NULL,
-  `AccelerationY` float default NULL,
-  `AccelerationZ` float default NULL,
-  `RotationX` float default NULL,
-  `RotationY` float default NULL,
-  `RotationZ` float default NULL,
-  `RotationW` float default NULL,
-  `SitTargetOffsetX` float default NULL,
-  `SitTargetOffsetY` float default NULL,
-  `SitTargetOffsetZ` float default NULL,
-  `SitTargetOrientW` float default NULL,
-  `SitTargetOrientX` float default NULL,
-  `SitTargetOrientY` float default NULL,
-  `SitTargetOrientZ` float default NULL,
-  PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE `primshapes` (
-  `UUID` varchar(255) NOT NULL,
-  `Shape` int(11) default NULL,
-  `ScaleX` float default NULL,
-  `ScaleY` float default NULL,
-  `ScaleZ` float default NULL,
-  `PCode` int(11) default NULL,
-  `PathBegin` int(11) default NULL,
-  `PathEnd` int(11) default NULL,
-  `PathScaleX` int(11) default NULL,
-  `PathScaleY` int(11) default NULL,
-  `PathShearX` int(11) default NULL,
-  `PathShearY` int(11) default NULL,
-  `PathSkew` int(11) default NULL,
-  `PathCurve` int(11) default NULL,
-  `PathRadiusOffset` int(11) default NULL,
-  `PathRevolutions` int(11) default NULL,
-  `PathTaperX` int(11) default NULL,
-  `PathTaperY` int(11) default NULL,
-  `PathTwist` int(11) default NULL,
-  `PathTwistBegin` int(11) default NULL,
-  `ProfileBegin` int(11) default NULL,
-  `ProfileEnd` int(11) default NULL,
-  `ProfileCurve` int(11) default NULL,
-  `ProfileHollow` int(11) default NULL,
-  `State` int(11) default NULL,
+:VERSION 51             #---------------------
+
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS `prims` (
+  `CreationDate` int(11) DEFAULT NULL,
+  `Name` varchar(255) DEFAULT NULL,
+  `Text` varchar(255) DEFAULT NULL,
+  `Description` varchar(255) DEFAULT NULL,
+  `SitName` varchar(255) DEFAULT NULL,
+  `TouchName` varchar(255) DEFAULT NULL,
+  `ObjectFlags` int(11) DEFAULT NULL,
+  `OwnerMask` int(11) DEFAULT NULL,
+  `NextOwnerMask` int(11) DEFAULT NULL,
+  `GroupMask` int(11) DEFAULT NULL,
+  `EveryoneMask` int(11) DEFAULT NULL,
+  `BaseMask` int(11) DEFAULT NULL,
+  `PositionX` double DEFAULT NULL,
+  `PositionY` double DEFAULT NULL,
+  `PositionZ` double DEFAULT NULL,
+  `GroupPositionX` double DEFAULT NULL,
+  `GroupPositionY` double DEFAULT NULL,
+  `GroupPositionZ` double DEFAULT NULL,
+  `VelocityX` double DEFAULT NULL,
+  `VelocityY` double DEFAULT NULL,
+  `VelocityZ` double DEFAULT NULL,
+  `AngularVelocityX` double DEFAULT NULL,
+  `AngularVelocityY` double DEFAULT NULL,
+  `AngularVelocityZ` double DEFAULT NULL,
+  `AccelerationX` double DEFAULT NULL,
+  `AccelerationY` double DEFAULT NULL,
+  `AccelerationZ` double DEFAULT NULL,
+  `RotationX` double DEFAULT NULL,
+  `RotationY` double DEFAULT NULL,
+  `RotationZ` double DEFAULT NULL,
+  `RotationW` double DEFAULT NULL,
+  `SitTargetOffsetX` double DEFAULT NULL,
+  `SitTargetOffsetY` double DEFAULT NULL,
+  `SitTargetOffsetZ` double DEFAULT NULL,
+  `SitTargetOrientW` double DEFAULT NULL,
+  `SitTargetOrientX` double DEFAULT NULL,
+  `SitTargetOrientY` double DEFAULT NULL,
+  `SitTargetOrientZ` double DEFAULT NULL,
+  `UUID` char(36) NOT NULL DEFAULT '',
+  `RegionUUID` char(36) DEFAULT NULL,
+  `CreatorID` varchar(255) NOT NULL DEFAULT '',
+  `OwnerID` char(36) DEFAULT NULL,
+  `GroupID` char(36) DEFAULT NULL,
+  `LastOwnerID` char(36) DEFAULT NULL,
+  `SceneGroupID` char(36) DEFAULT NULL,
+  `PayPrice` int(11) NOT NULL DEFAULT '0',
+  `PayButton1` int(11) NOT NULL DEFAULT '0',
+  `PayButton2` int(11) NOT NULL DEFAULT '0',
+  `PayButton3` int(11) NOT NULL DEFAULT '0',
+  `PayButton4` int(11) NOT NULL DEFAULT '0',
+  `LoopedSound` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `LoopedSoundGain` double NOT NULL DEFAULT '0',
+  `TextureAnimation` blob,
+  `OmegaX` double NOT NULL DEFAULT '0',
+  `OmegaY` double NOT NULL DEFAULT '0',
+  `OmegaZ` double NOT NULL DEFAULT '0',
+  `CameraEyeOffsetX` double NOT NULL DEFAULT '0',
+  `CameraEyeOffsetY` double NOT NULL DEFAULT '0',
+  `CameraEyeOffsetZ` double NOT NULL DEFAULT '0',
+  `CameraAtOffsetX` double NOT NULL DEFAULT '0',
+  `CameraAtOffsetY` double NOT NULL DEFAULT '0',
+  `CameraAtOffsetZ` double NOT NULL DEFAULT '0',
+  `ForceMouselook` tinyint(4) NOT NULL DEFAULT '0',
+  `ScriptAccessPin` int(11) NOT NULL DEFAULT '0',
+  `AllowedDrop` tinyint(4) NOT NULL DEFAULT '0',
+  `DieAtEdge` tinyint(4) NOT NULL DEFAULT '0',
+  `SalePrice` int(11) NOT NULL DEFAULT '10',
+  `SaleType` tinyint(4) NOT NULL DEFAULT '0',
+  `ColorR` int(11) NOT NULL DEFAULT '0',
+  `ColorG` int(11) NOT NULL DEFAULT '0',
+  `ColorB` int(11) NOT NULL DEFAULT '0',
+  `ColorA` int(11) NOT NULL DEFAULT '0',
+  `ParticleSystem` blob,
+  `ClickAction` tinyint(4) NOT NULL DEFAULT '0',
+  `Material` tinyint(4) NOT NULL DEFAULT '3',
+  `CollisionSound` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `CollisionSoundVolume` double NOT NULL DEFAULT '0',
+  `LinkNumber` int(11) NOT NULL DEFAULT '0',
+  `PassTouches` tinyint(4) NOT NULL DEFAULT '0',
+  `MediaURL` varchar(255) DEFAULT NULL,
+  `DynAttrs` text,
+  `PhysicsShapeType` tinyint(4) NOT NULL DEFAULT '0',
+  `Density` double NOT NULL DEFAULT '1000',
+  `GravityModifier` double NOT NULL DEFAULT '1',
+  `Friction` double NOT NULL DEFAULT '0.6',
+  `Restitution` double NOT NULL DEFAULT '0.5',
+  `KeyframeMotion` blob,
+  `AttachedPosX` double DEFAULT '0',
+  `AttachedPosY` double DEFAULT '0',
+  `AttachedPosZ` double DEFAULT '0',
+  PRIMARY KEY (`UUID`),
+  KEY `prims_regionuuid` (`RegionUUID`),
+  KEY `prims_scenegroupid` (`SceneGroupID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE IF NOT EXISTS `primshapes` (
+  `Shape` int(11) DEFAULT NULL,
+  `ScaleX` double NOT NULL DEFAULT '0',
+  `ScaleY` double NOT NULL DEFAULT '0',
+  `ScaleZ` double NOT NULL DEFAULT '0',
+  `PCode` int(11) DEFAULT NULL,
+  `PathBegin` int(11) DEFAULT NULL,
+  `PathEnd` int(11) DEFAULT NULL,
+  `PathScaleX` int(11) DEFAULT NULL,
+  `PathScaleY` int(11) DEFAULT NULL,
+  `PathShearX` int(11) DEFAULT NULL,
+  `PathShearY` int(11) DEFAULT NULL,
+  `PathSkew` int(11) DEFAULT NULL,
+  `PathCurve` int(11) DEFAULT NULL,
+  `PathRadiusOffset` int(11) DEFAULT NULL,
+  `PathRevolutions` int(11) DEFAULT NULL,
+  `PathTaperX` int(11) DEFAULT NULL,
+  `PathTaperY` int(11) DEFAULT NULL,
+  `PathTwist` int(11) DEFAULT NULL,
+  `PathTwistBegin` int(11) DEFAULT NULL,
+  `ProfileBegin` int(11) DEFAULT NULL,
+  `ProfileEnd` int(11) DEFAULT NULL,
+  `ProfileCurve` int(11) DEFAULT NULL,
+  `ProfileHollow` int(11) DEFAULT NULL,
+  `State` int(11) DEFAULT NULL,
   `Texture` longblob,
   `ExtraParams` longblob,
-  PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE `primitems` (
-  `itemID` varchar(255) NOT NULL,
-  `primID` varchar(255) default NULL,
-  `assetID` varchar(255) default NULL,
-  `parentFolderID` varchar(255) default NULL,
-  `invType` int(11) default NULL,
-  `assetType` int(11) default NULL,
-  `name` varchar(255) default NULL,
-  `description` varchar(255) default NULL,
-  `creationDate` bigint(20) default NULL,
-  `creatorID` varchar(255) default NULL,
-  `ownerID` varchar(255) default NULL,
-  `lastOwnerID` varchar(255) default NULL,
-  `groupID` varchar(255) default NULL,
-  `nextPermissions` int(11) default NULL,
-  `currentPermissions` int(11) default NULL,
-  `basePermissions` int(11) default NULL,
-  `everyonePermissions` int(11) default NULL,
-  `groupPermissions` int(11) default NULL,
-  PRIMARY KEY  (`itemID`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE `terrain` (
-  `RegionUUID` varchar(255) default NULL,
-  `Revision` int(11) default NULL,
+  `UUID` char(36) NOT NULL DEFAULT '',
+  `Media` text,
+  `LastAttachPoint` int(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`UUID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE IF NOT EXISTS `primitems` (
+  `invType` int(11) DEFAULT NULL,
+  `assetType` int(11) DEFAULT NULL,
+  `name` varchar(255) DEFAULT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `creationDate` bigint(20) DEFAULT NULL,
+  `nextPermissions` int(11) DEFAULT NULL,
+  `currentPermissions` int(11) DEFAULT NULL,
+  `basePermissions` int(11) DEFAULT NULL,
+  `everyonePermissions` int(11) DEFAULT NULL,
+  `groupPermissions` int(11) DEFAULT NULL,
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `itemID` char(36) NOT NULL DEFAULT '',
+  `primID` char(36) DEFAULT NULL,
+  `assetID` char(36) DEFAULT NULL,
+  `parentFolderID` char(36) DEFAULT NULL,
+  `CreatorID` varchar(255) NOT NULL DEFAULT '',
+  `ownerID` char(36) DEFAULT NULL,
+  `groupID` char(36) DEFAULT NULL,
+  `lastOwnerID` char(36) DEFAULT NULL,
+  PRIMARY KEY (`itemID`),
+  KEY `primitems_primid` (`primID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE IF NOT EXISTS `terrain` (
+  `RegionUUID` varchar(255) DEFAULT NULL,
+  `Revision` int(11) DEFAULT NULL,
   `Heightfield` longblob
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-CREATE TABLE `land` (
+CREATE TABLE IF NOT EXISTS `land` (
   `UUID` varchar(255) NOT NULL,
-  `RegionUUID` varchar(255) default NULL,
-  `LocalLandID` int(11) default NULL,
+  `RegionUUID` varchar(255) DEFAULT NULL,
+  `LocalLandID` int(11) DEFAULT NULL,
   `Bitmap` longblob,
-  `Name` varchar(255) default NULL,
-  `Description` varchar(255) default NULL,
-  `OwnerUUID` varchar(255) default NULL,
-  `IsGroupOwned` int(11) default NULL,
-  `Area` int(11) default NULL,
-  `AuctionID` int(11) default NULL,
-  `Category` int(11) default NULL,
-  `ClaimDate` int(11) default NULL,
-  `ClaimPrice` int(11) default NULL,
-  `GroupUUID` varchar(255) default NULL,
-  `SalePrice` int(11) default NULL,
-  `LandStatus` int(11) default NULL,
-  `LandFlags` int(11) default NULL,
-  `LandingType` int(11) default NULL,
-  `MediaAutoScale` int(11) default NULL,
-  `MediaTextureUUID` varchar(255) default NULL,
-  `MediaURL` varchar(255) default NULL,
-  `MusicURL` varchar(255) default NULL,
-  `PassHours` float default NULL,
-  `PassPrice` int(11) default NULL,
-  `SnapshotUUID` varchar(255) default NULL,
-  `UserLocationX` float default NULL,
-  `UserLocationY` float default NULL,
-  `UserLocationZ` float default NULL,
-  `UserLookAtX` float default NULL,
-  `UserLookAtY` float default NULL,
-  `UserLookAtZ` float default NULL,
-  `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
-  PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE `landaccesslist` (
-  `LandUUID` varchar(255) default NULL,
-  `AccessUUID` varchar(255) default NULL,
-  `Flags` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-COMMIT;
-
-:VERSION 2                      #---------------------
-
-BEGIN;
-
-CREATE index prims_regionuuid on prims(RegionUUID);
-CREATE index primitems_primid on primitems(primID);
-
-COMMIT;
-
-:VERSION 3                      #---------------------
-
-BEGIN;
-  CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-COMMIT;
-
-:VERSION 4                      #---------------------
-
-BEGIN;
-
-ALTER TABLE primitems add flags integer not null default 0;
-
-COMMIT;
-
-:VERSION 5                      #---------------------
-BEGIN;
-
-create table regionsettings (
-        regionUUID char(36) not null,
-        block_terraform integer not null,
-        block_fly integer not null,
-        allow_damage integer not null,
-        restrict_pushing integer not null,
-        allow_land_resell integer not null,
-        allow_land_join_divide integer not null,
-        block_show_in_search integer not null,
-        agent_limit integer not null,
-        object_bonus float not null,
-        maturity integer not null,
-        disable_scripts integer not null,
-        disable_collisions integer not null,
-        disable_physics integer not null,
-        terrain_texture_1 char(36) not null,
-        terrain_texture_2 char(36) not null,
-        terrain_texture_3 char(36) not null,
-        terrain_texture_4 char(36) not null,
-        elevation_1_nw float not null,
-        elevation_2_nw float not null,
-        elevation_1_ne float not null,
-        elevation_2_ne float not null,
-        elevation_1_se float not null,
-        elevation_2_se float not null,
-        elevation_1_sw float not null,
-        elevation_2_sw float not null,
-        water_height float not null,
-        terrain_raise_limit float not null,
-        terrain_lower_limit float not null,
-        use_estate_sun integer not null,
-        fixed_sun integer not null,
-        sun_position float not null,
-        covenant char(36),
-        primary key(regionUUID)
-);
-
-COMMIT;
-
-
-:VERSION 6                      #---------------------
-
-BEGIN;
-
-alter table landaccesslist ENGINE = MyISAM;
-alter table migrations ENGINE = MyISAM;
-alter table primitems ENGINE = MyISAM;
-alter table prims ENGINE = MyISAM;
-alter table primshapes ENGINE = MyISAM;
-alter table regionsettings ENGINE = MyISAM;
-alter table terrain ENGINE = MyISAM;
-
-COMMIT;
-
-:VERSION 7                      #---------------------
-
-BEGIN;
-
-ALTER TABLE prims change UUID UUIDold varchar(255);
-ALTER TABLE prims change RegionUUID RegionUUIDold varchar(255);
-ALTER TABLE prims change CreatorID CreatorIDold varchar(255);
-ALTER TABLE prims change OwnerID OwnerIDold varchar(255);
-ALTER TABLE prims change GroupID GroupIDold varchar(255);
-ALTER TABLE prims change LastOwnerID LastOwnerIDold varchar(255);
-ALTER TABLE prims add UUID char(36);
-ALTER TABLE prims add RegionUUID char(36);
-ALTER TABLE prims add CreatorID char(36);
-ALTER TABLE prims add OwnerID char(36);
-ALTER TABLE prims add GroupID char(36);
-ALTER TABLE prims add LastOwnerID char(36);
-UPDATE prims set UUID = UUIDold, RegionUUID = RegionUUIDold, CreatorID = CreatorIDold, OwnerID = OwnerIDold, GroupID = GroupIDold, LastOwnerID = LastOwnerIDold;
-ALTER TABLE prims drop UUIDold;
-ALTER TABLE prims drop RegionUUIDold;
-ALTER TABLE prims drop CreatorIDold;
-ALTER TABLE prims drop OwnerIDold;
-ALTER TABLE prims drop GroupIDold;
-ALTER TABLE prims drop LastOwnerIDold;
-ALTER TABLE prims add constraint primary key(UUID);
-ALTER TABLE prims add index prims_regionuuid(RegionUUID);
-
-COMMIT;
-
-:VERSION 8                      #---------------------
-
-BEGIN;
-
-ALTER TABLE primshapes change UUID UUIDold varchar(255);
-ALTER TABLE primshapes add UUID char(36);
-UPDATE primshapes set UUID = UUIDold;
-ALTER TABLE primshapes drop UUIDold;
-ALTER TABLE primshapes add constraint primary key(UUID);
-
-COMMIT;
-
-:VERSION 9                      #---------------------
-
-BEGIN;
- 
-ALTER TABLE primitems change itemID itemIDold varchar(255);
-ALTER TABLE primitems change primID primIDold varchar(255);
-ALTER TABLE primitems change assetID assetIDold varchar(255);
-ALTER TABLE primitems change parentFolderID parentFolderIDold varchar(255);
-ALTER TABLE primitems change creatorID creatorIDold varchar(255);
-ALTER TABLE primitems change ownerID ownerIDold varchar(255);
-ALTER TABLE primitems change groupID groupIDold varchar(255);
-ALTER TABLE primitems change lastOwnerID lastOwnerIDold varchar(255);
-ALTER TABLE primitems add itemID char(36);
-ALTER TABLE primitems add primID char(36);
-ALTER TABLE primitems add assetID char(36);
-ALTER TABLE primitems add parentFolderID char(36);
-ALTER TABLE primitems add creatorID char(36);
-ALTER TABLE primitems add ownerID char(36);
-ALTER TABLE primitems add groupID char(36);
-ALTER TABLE primitems add lastOwnerID char(36);
-UPDATE primitems set itemID = itemIDold, primID = primIDold, assetID = assetIDold, parentFolderID = parentFolderIDold, creatorID = creatorIDold, ownerID = ownerIDold, groupID = groupIDold, lastOwnerID = lastOwnerIDold;
-ALTER TABLE primitems drop itemIDold;
-ALTER TABLE primitems drop primIDold;
-ALTER TABLE primitems drop assetIDold;
-ALTER TABLE primitems drop parentFolderIDold;
-ALTER TABLE primitems drop creatorIDold;
-ALTER TABLE primitems drop ownerIDold;
-ALTER TABLE primitems drop groupIDold;
-ALTER TABLE primitems drop lastOwnerIDold;
-ALTER TABLE primitems add constraint primary key(itemID);
-ALTER TABLE primitems add index primitems_primid(primID);
-
-COMMIT;
-
-:VERSION 10                     #---------------------
-
-# 1 "010_RegionStore.sql"
-# 1 "<built-in>"
-# 1 "<command line>"
-# 1 "010_RegionStore.sql"
-BEGIN;
-
-DELETE FROM regionsettings;
-
-COMMIT;
-
-
-:VERSION 11                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims change SceneGroupID SceneGroupIDold varchar(255);
-ALTER TABLE prims add SceneGroupID char(36);
-UPDATE prims set SceneGroupID = SceneGroupIDold;
-ALTER TABLE prims drop SceneGroupIDold;
-ALTER TABLE prims add index prims_scenegroupid(SceneGroupID);
-
-COMMIT;
-
-:VERSION 12                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims add index prims_parentid(ParentID);
-
-COMMIT;
-
-:VERSION 13                     #---------------------
-begin;
-
-drop table regionsettings;
-
-CREATE TABLE `regionsettings` (
+  `Name` varchar(255) DEFAULT NULL,
+  `Description` varchar(255) DEFAULT NULL,
+  `OwnerUUID` varchar(255) DEFAULT NULL,
+  `IsGroupOwned` int(11) DEFAULT NULL,
+  `Area` int(11) DEFAULT NULL,
+  `AuctionID` int(11) DEFAULT NULL,
+  `Category` int(11) DEFAULT NULL,
+  `ClaimDate` int(11) DEFAULT NULL,
+  `ClaimPrice` int(11) DEFAULT NULL,
+  `GroupUUID` varchar(255) DEFAULT NULL,
+  `SalePrice` int(11) DEFAULT NULL,
+  `LandStatus` int(11) DEFAULT NULL,
+  `LandFlags` int(10) unsigned DEFAULT NULL,
+  `LandingType` int(11) DEFAULT NULL,
+  `MediaAutoScale` int(11) DEFAULT NULL,
+  `MediaTextureUUID` varchar(255) DEFAULT NULL,
+  `MediaURL` varchar(255) DEFAULT NULL,
+  `MusicURL` varchar(255) DEFAULT NULL,
+  `PassHours` float DEFAULT NULL,
+  `PassPrice` int(11) DEFAULT NULL,
+  `SnapshotUUID` varchar(255) DEFAULT NULL,
+  `UserLocationX` float DEFAULT NULL,
+  `UserLocationY` float DEFAULT NULL,
+  `UserLocationZ` float DEFAULT NULL,
+  `UserLookAtX` float DEFAULT NULL,
+  `UserLookAtY` float DEFAULT NULL,
+  `UserLookAtZ` float DEFAULT NULL,
+  `AuthbuyerID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `OtherCleanTime` int(11) NOT NULL DEFAULT '0',
+  `Dwell` int(11) NOT NULL DEFAULT '0',
+  `MediaType` varchar(32) NOT NULL DEFAULT 'none/none',
+  `MediaDescription` varchar(255) NOT NULL DEFAULT '',
+  `MediaSize` varchar(16) NOT NULL DEFAULT '0,0',
+  `MediaLoop` tinyint(1) NOT NULL DEFAULT '0',
+  `ObscureMusic` tinyint(1) NOT NULL DEFAULT '0',
+  `ObscureMedia` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`UUID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `landaccesslist` (
+  `LandUUID` varchar(255) DEFAULT NULL,
+  `AccessUUID` varchar(255) DEFAULT NULL,
+  `Flags` int(11) DEFAULT NULL,
+  `Expires` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE IF NOT EXISTS `regionban` (
+  `regionUUID` varchar(36) NOT NULL,
+  `bannedUUID` varchar(36) NOT NULL,
+  `bannedIp` varchar(16) NOT NULL,
+  `bannedIpHostMask` varchar(16) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `regionsettings` (
   `regionUUID` char(36) NOT NULL,
   `block_terraform` int(11) NOT NULL,
   `block_fly` int(11) NOT NULL,
@@ -358,7 +230,7 @@ CREATE TABLE `regionsettings` (
   `allow_land_join_divide` int(11) NOT NULL,
   `block_show_in_search` int(11) NOT NULL,
   `agent_limit` int(11) NOT NULL,
-  `object_bonus` float NOT NULL,
+  `object_bonus` double NOT NULL,
   `maturity` int(11) NOT NULL,
   `disable_scripts` int(11) NOT NULL,
   `disable_collisions` int(11) NOT NULL,
@@ -367,360 +239,35 @@ CREATE TABLE `regionsettings` (
   `terrain_texture_2` char(36) NOT NULL,
   `terrain_texture_3` char(36) NOT NULL,
   `terrain_texture_4` char(36) NOT NULL,
-  `elevation_1_nw` float NOT NULL,
-  `elevation_2_nw` float NOT NULL,
-  `elevation_1_ne` float NOT NULL,
-  `elevation_2_ne` float NOT NULL,
-  `elevation_1_se` float NOT NULL,
-  `elevation_2_se` float NOT NULL,
-  `elevation_1_sw` float NOT NULL,
-  `elevation_2_sw` float NOT NULL,
-  `water_height` float NOT NULL,
-  `terrain_raise_limit` float NOT NULL,
-  `terrain_lower_limit` float NOT NULL,
+  `elevation_1_nw` double NOT NULL,
+  `elevation_2_nw` double NOT NULL,
+  `elevation_1_ne` double NOT NULL,
+  `elevation_2_ne` double NOT NULL,
+  `elevation_1_se` double NOT NULL,
+  `elevation_2_se` double NOT NULL,
+  `elevation_1_sw` double NOT NULL,
+  `elevation_2_sw` double NOT NULL,
+  `water_height` double NOT NULL,
+  `terrain_raise_limit` double NOT NULL,
+  `terrain_lower_limit` double NOT NULL,
   `use_estate_sun` int(11) NOT NULL,
   `fixed_sun` int(11) NOT NULL,
-  `sun_position` float NOT NULL,
-  `covenant` char(36) default NULL,
+  `sun_position` double NOT NULL,
+  `covenant` char(36) DEFAULT NULL,
   `Sandbox` tinyint(4) NOT NULL,
-  PRIMARY KEY  (`regionUUID`)
-) ENGINE=MyISAM;
-
-commit;
-
-:VERSION 16                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN PayPrice integer not null default 0;
-ALTER TABLE prims ADD COLUMN PayButton1 integer not null default 0;
-ALTER TABLE prims ADD COLUMN PayButton2 integer not null default 0;
-ALTER TABLE prims ADD COLUMN PayButton3 integer not null default 0;
-ALTER TABLE prims ADD COLUMN PayButton4 integer not null default 0;
-ALTER TABLE prims ADD COLUMN LoopedSound char(36) not null default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE prims ADD COLUMN LoopedSoundGain float not null default 0.0;
-ALTER TABLE prims ADD COLUMN TextureAnimation blob;
-ALTER TABLE prims ADD COLUMN OmegaX float not null default 0.0;
-ALTER TABLE prims ADD COLUMN OmegaY float not null default 0.0;
-ALTER TABLE prims ADD COLUMN OmegaZ float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetX float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetY float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetZ float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetX float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetY float not null default 0.0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetZ float not null default 0.0;
-ALTER TABLE prims ADD COLUMN ForceMouselook tinyint not null default 0;
-ALTER TABLE prims ADD COLUMN ScriptAccessPin integer not null default 0;
-ALTER TABLE prims ADD COLUMN AllowedDrop tinyint not null default 0;
-ALTER TABLE prims ADD COLUMN DieAtEdge tinyint not null default 0;
-ALTER TABLE prims ADD COLUMN SalePrice integer not null default 10;
-ALTER TABLE prims ADD COLUMN SaleType tinyint not null default 0;
-
-COMMIT;
-
-
-:VERSION 17                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN ColorR integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorG integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorB integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorA integer not null default 0;
-ALTER TABLE prims ADD COLUMN ParticleSystem blob;
-
-COMMIT;
-
-
-:VERSION 18                     #---------------------
-
-begin;
-
-ALTER TABLE prims ADD COLUMN ClickAction tinyint NOT NULL default 0;
-
-commit;
-
-:VERSION 19                     #---------------------
-
-begin;
-
-ALTER TABLE prims ADD COLUMN Material tinyint NOT NULL default 3;
-
-commit;
-
-
-:VERSION 20                     #---------------------
-
-begin;
-
-ALTER TABLE land ADD COLUMN OtherCleanTime integer NOT NULL default 0;
-ALTER TABLE land ADD COLUMN Dwell integer NOT NULL default 0;
-
-commit;
-
-:VERSION 21                     #---------------------
-
-begin;
-
-ALTER TABLE regionsettings ADD COLUMN sunvectorx double NOT NULL default 0;
-ALTER TABLE regionsettings ADD COLUMN sunvectory double NOT NULL default 0;
-ALTER TABLE regionsettings ADD COLUMN sunvectorz double NOT NULL default 0;
-
-commit;
-
-
-:VERSION 22                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE prims ADD COLUMN CollisionSoundVolume float not null default 0.0;
-
-COMMIT;
-
-:VERSION 23                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN LinkNumber integer not null default 0;
-
-COMMIT;
-
-:VERSION 24                     #---------------------
-
-BEGIN;
-
-alter table regionsettings change column `object_bonus` `object_bonus` double NOT NULL;
-alter table regionsettings change column `elevation_1_nw` `elevation_1_nw` double NOT NULL;
-alter table regionsettings change column `elevation_2_nw` `elevation_2_nw` double NOT NULL;
-alter table regionsettings change column `elevation_1_ne` `elevation_1_ne` double NOT NULL;
-alter table regionsettings change column `elevation_2_ne` `elevation_2_ne` double NOT NULL;
-alter table regionsettings change column `elevation_1_se` `elevation_1_se` double NOT NULL;
-alter table regionsettings change column `elevation_2_se` `elevation_2_se` double NOT NULL;
-alter table regionsettings change column `elevation_1_sw` `elevation_1_sw` double NOT NULL;
-alter table regionsettings change column `elevation_2_sw` `elevation_2_sw` double NOT NULL;
-alter table regionsettings change column `water_height` `water_height` double NOT NULL;
-alter table regionsettings change column `terrain_raise_limit` `terrain_raise_limit` double NOT NULL;
-alter table regionsettings change column `terrain_lower_limit` `terrain_lower_limit` double NOT NULL;
-alter table regionsettings change column `sun_position` `sun_position` double NOT NULL;
-
-COMMIT;
-
-
-:VERSION 25                     #---------------------
-
-BEGIN;
-
-alter table prims change column `PositionX` `PositionX` double default NULL;
-alter table prims change column `PositionY` `PositionY` double default NULL;
-alter table prims change column `PositionZ` `PositionZ` double default NULL;
-alter table prims change column `GroupPositionX` `GroupPositionX` double default NULL;
-alter table prims change column `GroupPositionY` `GroupPositionY` double default NULL;
-alter table prims change column `GroupPositionZ` `GroupPositionZ` double default NULL;
-alter table prims change column `VelocityX` `VelocityX` double default NULL;
-alter table prims change column `VelocityY` `VelocityY` double default NULL;
-alter table prims change column `VelocityZ` `VelocityZ` double default NULL;
-alter table prims change column `AngularVelocityX` `AngularVelocityX` double default NULL;
-alter table prims change column `AngularVelocityY` `AngularVelocityY` double default NULL;
-alter table prims change column `AngularVelocityZ` `AngularVelocityZ` double default NULL;
-alter table prims change column `AccelerationX` `AccelerationX` double default NULL;
-alter table prims change column `AccelerationY` `AccelerationY` double default NULL;
-alter table prims change column `AccelerationZ` `AccelerationZ` double default NULL;
-alter table prims change column `RotationX` `RotationX` double default NULL;
-alter table prims change column `RotationY` `RotationY` double default NULL;
-alter table prims change column `RotationZ` `RotationZ` double default NULL;
-alter table prims change column `RotationW` `RotationW` double default NULL;
-alter table prims change column `SitTargetOffsetX` `SitTargetOffsetX` double default NULL;
-alter table prims change column `SitTargetOffsetY` `SitTargetOffsetY` double default NULL;
-alter table prims change column `SitTargetOffsetZ` `SitTargetOffsetZ` double default NULL;
-alter table prims change column `SitTargetOrientW` `SitTargetOrientW` double default NULL;
-alter table prims change column `SitTargetOrientX` `SitTargetOrientX` double default NULL;
-alter table prims change column `SitTargetOrientY` `SitTargetOrientY` double default NULL;
-alter table prims change column `SitTargetOrientZ` `SitTargetOrientZ` double default NULL;
-alter table prims change column `LoopedSoundGain` `LoopedSoundGain` double NOT NULL default '0';
-alter table prims change column `OmegaX` `OmegaX` double NOT NULL default '0';
-alter table prims change column `OmegaY` `OmegaY` double NOT NULL default '0';
-alter table prims change column `OmegaZ` `OmegaZ` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetX` `CameraEyeOffsetX` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetY` `CameraEyeOffsetY` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetZ` `CameraEyeOffsetZ` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetX` `CameraAtOffsetX` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetY` `CameraAtOffsetY` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetZ` `CameraAtOffsetZ` double NOT NULL default '0';
-alter table prims change column `CollisionSoundVolume` `CollisionSoundVolume` double NOT NULL default '0';
-
-alter table primshapes change column `ScaleX` `ScaleX` double NOT NULL default '0';
-alter table primshapes change column `ScaleY` `ScaleY` double NOT NULL default '0';
-alter table primshapes change column `ScaleZ` `ScaleZ` double NOT NULL default '0';
-
-COMMIT;
-
-:VERSION 26                     #---------------------
-
-begin;
-
-alter table prims change column `PositionX` `PositionX` double default NULL;
-alter table prims change column `PositionY` `PositionY` double default NULL;
-alter table prims change column `PositionZ` `PositionZ` double default NULL;
-alter table prims change column `GroupPositionX` `GroupPositionX` double default NULL;
-alter table prims change column `GroupPositionY` `GroupPositionY` double default NULL;
-alter table prims change column `GroupPositionZ` `GroupPositionZ` double default NULL;
-alter table prims change column `VelocityX` `VelocityX` double default NULL;
-alter table prims change column `VelocityY` `VelocityY` double default NULL;
-alter table prims change column `VelocityZ` `VelocityZ` double default NULL;
-alter table prims change column `AngularVelocityX` `AngularVelocityX` double default NULL;
-alter table prims change column `AngularVelocityY` `AngularVelocityY` double default NULL;
-alter table prims change column `AngularVelocityZ` `AngularVelocityZ` double default NULL;
-alter table prims change column `AccelerationX` `AccelerationX` double default NULL;
-alter table prims change column `AccelerationY` `AccelerationY` double default NULL;
-alter table prims change column `AccelerationZ` `AccelerationZ` double default NULL;
-alter table prims change column `RotationX` `RotationX` double default NULL;
-alter table prims change column `RotationY` `RotationY` double default NULL;
-alter table prims change column `RotationZ` `RotationZ` double default NULL;
-alter table prims change column `RotationW` `RotationW` double default NULL;
-alter table prims change column `SitTargetOffsetX` `SitTargetOffsetX` double default NULL;
-alter table prims change column `SitTargetOffsetY` `SitTargetOffsetY` double default NULL;
-alter table prims change column `SitTargetOffsetZ` `SitTargetOffsetZ` double default NULL;
-alter table prims change column `SitTargetOrientW` `SitTargetOrientW` double default NULL;
-alter table prims change column `SitTargetOrientX` `SitTargetOrientX` double default NULL;
-alter table prims change column `SitTargetOrientY` `SitTargetOrientY` double default NULL;
-alter table prims change column `SitTargetOrientZ` `SitTargetOrientZ` double default NULL;
-alter table prims change column `LoopedSoundGain` `LoopedSoundGain` double NOT NULL default '0';
-alter table prims change column `OmegaX` `OmegaX` double NOT NULL default '0';
-alter table prims change column `OmegaY` `OmegaY` double NOT NULL default '0';
-alter table prims change column `OmegaZ` `OmegaZ` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetX` `CameraEyeOffsetX` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetY` `CameraEyeOffsetY` double NOT NULL default '0';
-alter table prims change column `CameraEyeOffsetZ` `CameraEyeOffsetZ` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetX` `CameraAtOffsetX` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetY` `CameraAtOffsetY` double NOT NULL default '0';
-alter table prims change column `CameraAtOffsetZ` `CameraAtOffsetZ` double NOT NULL default '0';
-alter table prims change column `CollisionSoundVolume` `CollisionSoundVolume` double NOT NULL default '0';
-
-commit;
-
-:VERSION 27                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims DROP COLUMN ParentID;
-
-COMMIT;
-
-:VERSION 28                     #---------------------
-
-BEGIN;
-
-update terrain
-  set RegionUUID = concat(substr(RegionUUID, 1, 8), "-", substr(RegionUUID, 9, 4), "-", substr(RegionUUID, 13, 4), "-", substr(RegionUUID, 17, 4), "-", substr(RegionUUID, 21, 12))
-  where RegionUUID not like '%-%';
-  
-
-update landaccesslist
-  set LandUUID = concat(substr(LandUUID, 1, 8), "-", substr(LandUUID, 9, 4), "-", substr(LandUUID, 13, 4), "-", substr(LandUUID, 17, 4), "-", substr(LandUUID, 21, 12))
-  where LandUUID not like '%-%';  
-
-update landaccesslist
-  set AccessUUID = concat(substr(AccessUUID, 1, 8), "-", substr(AccessUUID, 9, 4), "-", substr(AccessUUID, 13, 4), "-", substr(AccessUUID, 17, 4), "-", substr(AccessUUID, 21, 12))
-  where AccessUUID not like '%-%';  
-  
-
-update prims
-  set UUID = concat(substr(UUID, 1, 8), "-", substr(UUID, 9, 4), "-", substr(UUID, 13, 4), "-", substr(UUID, 17, 4), "-", substr(UUID, 21, 12))
-  where UUID not like '%-%';
-
-update prims
-  set RegionUUID = concat(substr(RegionUUID, 1, 8), "-", substr(RegionUUID, 9, 4), "-", substr(RegionUUID, 13, 4), "-", substr(RegionUUID, 17, 4), "-", substr(RegionUUID, 21, 12))
-  where RegionUUID not like '%-%';  
-
-update prims
-  set SceneGroupID = concat(substr(SceneGroupID, 1, 8), "-", substr(SceneGroupID, 9, 4), "-", substr(SceneGroupID, 13, 4), "-", substr(SceneGroupID, 17, 4), "-", substr(SceneGroupID, 21, 12))
-  where SceneGroupID not like '%-%';  
-
-update prims
-  set CreatorID = concat(substr(CreatorID, 1, 8), "-", substr(CreatorID, 9, 4), "-", substr(CreatorID, 13, 4), "-", substr(CreatorID, 17, 4), "-", substr(CreatorID, 21, 12))
-  where CreatorID not like '%-%';  
-
-update prims
-  set OwnerID = concat(substr(OwnerID, 1, 8), "-", substr(OwnerID, 9, 4), "-", substr(OwnerID, 13, 4), "-", substr(OwnerID, 17, 4), "-", substr(OwnerID, 21, 12))
-  where OwnerID not like '%-%';  
-
-update prims
-  set GroupID = concat(substr(GroupID, 1, 8), "-", substr(GroupID, 9, 4), "-", substr(GroupID, 13, 4), "-", substr(GroupID, 17, 4), "-", substr(GroupID, 21, 12))
-  where GroupID not like '%-%';  
-
-update prims
-  set LastOwnerID = concat(substr(LastOwnerID, 1, 8), "-", substr(LastOwnerID, 9, 4), "-", substr(LastOwnerID, 13, 4), "-", substr(LastOwnerID, 17, 4), "-", substr(LastOwnerID, 21, 12))
-  where LastOwnerID not like '%-%';  
-
-
-update primshapes
-  set UUID = concat(substr(UUID, 1, 8), "-", substr(UUID, 9, 4), "-", substr(UUID, 13, 4), "-", substr(UUID, 17, 4), "-", substr(UUID, 21, 12))
-  where UUID not like '%-%';    
-
-
-update land
-  set UUID = concat(substr(UUID, 1, 8), "-", substr(UUID, 9, 4), "-", substr(UUID, 13, 4), "-", substr(UUID, 17, 4), "-", substr(UUID, 21, 12))
-  where UUID not like '%-%';      
-  
-update land
-  set RegionUUID = concat(substr(RegionUUID, 1, 8), "-", substr(RegionUUID, 9, 4), "-", substr(RegionUUID, 13, 4), "-", substr(RegionUUID, 17, 4), "-", substr(RegionUUID, 21, 12))
-  where RegionUUID not like '%-%';      
-
-update land
-  set OwnerUUID = concat(substr(OwnerUUID, 1, 8), "-", substr(OwnerUUID, 9, 4), "-", substr(OwnerUUID, 13, 4), "-", substr(OwnerUUID, 17, 4), "-", substr(OwnerUUID, 21, 12))
-  where OwnerUUID not like '%-%';      
-
-update land
-  set GroupUUID = concat(substr(GroupUUID, 1, 8), "-", substr(GroupUUID, 9, 4), "-", substr(GroupUUID, 13, 4), "-", substr(GroupUUID, 17, 4), "-", substr(GroupUUID, 21, 12))
-  where GroupUUID not like '%-%';      
-
-update land
-  set MediaTextureUUID = concat(substr(MediaTextureUUID, 1, 8), "-", substr(MediaTextureUUID, 9, 4), "-", substr(MediaTextureUUID, 13, 4), "-", substr(MediaTextureUUID, 17, 4), "-", substr(MediaTextureUUID, 21, 12))
-  where MediaTextureUUID not like '%-%';      
-
-update land
-  set SnapshotUUID = concat(substr(SnapshotUUID, 1, 8), "-", substr(SnapshotUUID, 9, 4), "-", substr(SnapshotUUID, 13, 4), "-", substr(SnapshotUUID, 17, 4), "-", substr(SnapshotUUID, 21, 12))
-  where SnapshotUUID not like '%-%';      
-
-update land
-  set AuthbuyerID = concat(substr(AuthbuyerID, 1, 8), "-", substr(AuthbuyerID, 9, 4), "-", substr(AuthbuyerID, 13, 4), "-", substr(AuthbuyerID, 17, 4), "-", substr(AuthbuyerID, 21, 12))
-  where AuthbuyerID not like '%-%';      
-  
-COMMIT;
-
-:VERSION 29                     #---------------------
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN PassTouches tinyint not null default 0;
-
-COMMIT;
-
-:VERSION 30                     #---------------------
-
-BEGIN;
-
-ALTER TABLE regionsettings ADD COLUMN loaded_creation_date varchar(20) default NULL;
-ALTER TABLE regionsettings ADD COLUMN loaded_creation_time varchar(20) default NULL;
-ALTER TABLE regionsettings ADD COLUMN loaded_creation_id varchar(64) default NULL;
-
-COMMIT;
-
-:VERSION 31                     #---------------------
-
-BEGIN;
-
-ALTER TABLE regionsettings DROP COLUMN loaded_creation_date;
-ALTER TABLE regionsettings DROP COLUMN loaded_creation_time;
-ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 32
-
-BEGIN;
-CREATE TABLE `regionwindlight` (
+  `sunvectorx` double NOT NULL DEFAULT '0',
+  `sunvectory` double NOT NULL DEFAULT '0',
+  `sunvectorz` double NOT NULL DEFAULT '0',
+  `loaded_creation_id` varchar(64) DEFAULT NULL,
+  `loaded_creation_datetime` int(10) unsigned NOT NULL DEFAULT '0',
+  `map_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `covenant_datetime` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`regionUUID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `regionwindlight` (
   `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
   `water_color_r` float(9,6) unsigned NOT NULL DEFAULT '4.000000',
   `water_color_g` float(9,6) unsigned NOT NULL DEFAULT '38.000000',
@@ -779,172 +326,144 @@ CREATE TABLE `regionwindlight` (
   `cloud_detail_x` float(3,2) unsigned NOT NULL DEFAULT '1.00',
   `cloud_detail_y` float(3,2) unsigned NOT NULL DEFAULT '0.53',
   `cloud_detail_density` float(3,2) unsigned NOT NULL DEFAULT '0.12',
-  `cloud_scroll_x` float(3,2) unsigned NOT NULL DEFAULT '0.20',
+  `cloud_scroll_x` float(4,2) NOT NULL DEFAULT '0.20',
   `cloud_scroll_x_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `cloud_scroll_y` float(3,2) unsigned NOT NULL DEFAULT '0.01',
+  `cloud_scroll_y` float(4,2) NOT NULL DEFAULT '0.01',
   `cloud_scroll_y_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `draw_classic_clouds` tinyint(1) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`region_id`)
-);
-
-
-:VERSION 33                     #---------------------
-
-BEGIN;
-ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
-
-:VERSION 34         #---------------------
-
-BEGIN;
-ALTER TABLE `regionwindlight`  CHANGE COLUMN `cloud_scroll_x` `cloud_scroll_x` FLOAT(4,2) NOT NULL DEFAULT '0.20' AFTER `cloud_detail_density`,  CHANGE COLUMN `cloud_scroll_y` `cloud_scroll_y` FLOAT(4,2) NOT NULL DEFAULT '0.01' AFTER `cloud_scroll_x_lock`;
-COMMIT;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-:VERSION 35         #---------------------
-
-BEGIN;
-ALTER TABLE prims ADD COLUMN MediaURL varchar(255);
-ALTER TABLE primshapes ADD COLUMN Media TEXT;
-COMMIT;
-
-:VERSION 36         #---------------------
-
-BEGIN;
-ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none' ;
-ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0';
-ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
-ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
-ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
-COMMIT;
-
-:VERSION 37         #---------------------
-
-BEGIN;
-
-ALTER TABLE `prims` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `primitems` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT '';
-
-COMMIT;
-
-:VERSION 38          #---------------------
-
-BEGIN;
-
-alter table land ENGINE = MyISAM;
-alter table landaccesslist ENGINE = MyISAM;
-alter table migrations ENGINE = MyISAM;
-alter table primitems ENGINE = MyISAM;
-alter table prims ENGINE = MyISAM;
-alter table primshapes ENGINE = MyISAM;
-alter table regionban ENGINE = MyISAM;
-alter table regionsettings ENGINE = MyISAM;
-alter table terrain ENGINE = MyISAM;
-
-COMMIT;
-
-:VERSION 39        #--------------- Telehub support
-
-BEGIN;
 CREATE TABLE IF NOT EXISTS `spawn_points` (
-  `RegionID` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
+  `RegionID` varchar(36) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
   `Yaw` float NOT NULL,
   `Pitch` float NOT NULL,
   `Distance` float NOT NULL,
   KEY `RegionID` (`RegionID`)
-) ENGINE=MyISAM;
-
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
-COMMIT;
-
-:VERSION 40       #---------------- Parcels for sale
-
-BEGIN;
-ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
-
-:VERSION 41       #---------------- Timed bans/access
-
-BEGIN;
-ALTER TABLE `landaccesslist` ADD COLUMN `Expires` INTEGER NOT NULL DEFAULT 0;
-COMMIT;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-:VERSION 42       #--------------------- Region Covenant changed time
-
-BEGIN;
-ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0';
-COMMIT;
-
-:VERSION 43         #--------------------- 
-
-BEGIN;
-
-ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 44         #--------------------- Environment Settings
-
-BEGIN;
-
-CREATE TABLE `regionenvironment` (
+CREATE TABLE IF NOT EXISTS `regionenvironment` (
   `region_id` varchar(36) NOT NULL,
-  `llsd_settings` TEXT NOT NULL,
+  `llsd_settings` text NOT NULL,
   PRIMARY KEY (`region_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-COMMIT;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-:VERSION 45
-
-BEGIN;
-
-CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
+CREATE TABLE IF NOT EXISTS `regionextra` (
+  `RegionID` char(36) NOT NULL,
+  `Name` varchar(32) NOT NULL,
+  `value` text,
+  PRIMARY KEY (`RegionID`,`Name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
-:VERSION 46       #---------------- Dynamic attributes
+:VERSION 52        #---- avination fields
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+ALTER TABLE `prims` ADD COLUMN `PassCollisions` tinyint(4) NOT NULL default '0';
+ALTER TABLE `prims` ADD COLUMN `Vehicle` TEXT default NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `block_search` tinyint(4) NOT NULL default '0';
+ALTER TABLE `regionsettings` ADD COLUMN `casino` tinyint(4) NOT NULL default '0';
+ALTER TABLE `land` ADD COLUMN `SeeAVs` tinyint(4) NOT NULL default '1';
+ALTER TABLE `land` ADD COLUMN `AnyAVSounds` tinyint(4) NOT NULL default '1';
+ALTER TABLE `land` ADD COLUMN `GroupAVSounds` tinyint(4) NOT NULL default '1';
 
 COMMIT;
 
-:VERSION 47       #---------------- Extra physics params
+:VERSION 53         #---- STATUS ROTATION axis locks
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0';
-ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000';
-ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1';
-ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
-ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
+ALTER TABLE `prims` ADD COLUMN `RotationAxisLocks` tinyint(4) NOT NULL default '0';
 
 COMMIT;
 
-:VERSION 48       #---------------- Keyframes
+:VERSION 54         #----- add baked terrain store
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
-
-COMMIT;
-
-:VERSION 49         #--------------------- Save attachment info
-
-BEGIN;
-ALTER TABLE prims ADD COLUMN AttachedPosX double default 0;
-ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
-ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
-ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
-COMMIT;
-
-:VERSION 50        #---- Change LandFlags to unsigned
-
-BEGIN;
-
-ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null;
-
+CREATE TABLE IF NOT EXISTS `bakedterrain` (
+  `RegionUUID` varchar(255) DEFAULT NULL,
+  `Revision` int(11) DEFAULT NULL,
+  `Heightfield` longblob
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
+
+:VERSION 55         #----- Increase float precision for windlight needed by scripts
+
+BEGIN;
+
+ALTER TABLE `regionwindlight`
+
+MODIFY `water_fog_density_exponent` float(9,7) unsigned NOT NULL DEFAULT '4.0',
+MODIFY `underwater_fog_modifier` float(9,8) unsigned NOT NULL DEFAULT '0.25',
+MODIFY `reflection_wavelet_scale_1` float(9,7) unsigned NOT NULL DEFAULT '2.0',
+MODIFY `reflection_wavelet_scale_2` float(9,7) unsigned NOT NULL DEFAULT '2.0',
+MODIFY `reflection_wavelet_scale_3` float(9,7) unsigned NOT NULL DEFAULT '2.0',
+MODIFY `fresnel_scale` float(9,8) unsigned NOT NULL DEFAULT '0.40',
+MODIFY `fresnel_offset` float(9,8) unsigned NOT NULL DEFAULT '0.50',
+MODIFY `refract_scale_above` float(9,8) unsigned NOT NULL DEFAULT '0.03',
+MODIFY `refract_scale_below` float(9,8) unsigned NOT NULL DEFAULT '0.20',
+MODIFY `blur_multiplier` float(9,8) unsigned NOT NULL DEFAULT '0.040',
+MODIFY `big_wave_direction_x` float(9,8) NOT NULL DEFAULT '1.05',
+MODIFY `big_wave_direction_y` float(9,8) NOT NULL DEFAULT '-0.42',
+MODIFY `little_wave_direction_x` float(9,8) NOT NULL DEFAULT '1.11',
+MODIFY `little_wave_direction_y` float(9,8) NOT NULL DEFAULT '-1.16',
+MODIFY `horizon_r` float(9,8) unsigned NOT NULL DEFAULT '0.25',
+MODIFY `horizon_g` float(9,8) unsigned NOT NULL DEFAULT '0.25',
+MODIFY `horizon_b` float(9,8) unsigned NOT NULL DEFAULT '0.32',
+MODIFY `horizon_i` float(9,8) unsigned NOT NULL DEFAULT '0.32',
+MODIFY `haze_horizon` float(9,8) unsigned NOT NULL DEFAULT '0.19',
+MODIFY `blue_density_r` float(9,8) unsigned NOT NULL DEFAULT '0.12',
+MODIFY `blue_density_g` float(9,8) unsigned NOT NULL DEFAULT '0.22',
+MODIFY `blue_density_b` float(9,8) unsigned NOT NULL DEFAULT '0.38',
+MODIFY `blue_density_i` float(9,8) unsigned NOT NULL DEFAULT '0.38',
+MODIFY `haze_density` float(9,8) unsigned NOT NULL DEFAULT '0.70',
+MODIFY `density_multiplier` float(9,8) unsigned NOT NULL DEFAULT '0.18',
+MODIFY `distance_multiplier` float(9,6) unsigned NOT NULL DEFAULT '0.8',
+MODIFY `sun_moon_color_r` float(9,8) unsigned NOT NULL DEFAULT '0.24',
+MODIFY `sun_moon_color_g` float(9,8) unsigned NOT NULL DEFAULT '0.26',
+MODIFY `sun_moon_color_b` float(9,8) unsigned NOT NULL DEFAULT '0.30',
+MODIFY `sun_moon_color_i` float(9,8) unsigned NOT NULL DEFAULT '0.30',
+MODIFY `sun_moon_position` float(9,8) unsigned NOT NULL DEFAULT '0.317',
+MODIFY `ambient_r` float(9,8) unsigned NOT NULL DEFAULT '0.35',
+MODIFY `ambient_g` float(9,8) unsigned NOT NULL DEFAULT '0.35',
+MODIFY `ambient_b` float(9,8) unsigned NOT NULL DEFAULT '0.35',
+MODIFY `ambient_i` float(9,8) unsigned NOT NULL DEFAULT '0.35',
+MODIFY `east_angle` float(9,8) unsigned NOT NULL DEFAULT '0.00',
+MODIFY `sun_glow_focus` float(9,8) unsigned NOT NULL DEFAULT '0.10',
+MODIFY `sun_glow_size` float(9,8) unsigned NOT NULL DEFAULT '1.75',
+MODIFY `scene_gamma` float(9,7) unsigned NOT NULL DEFAULT '1.00',
+MODIFY `star_brightness` float(9,8) unsigned NOT NULL DEFAULT '0.00',
+MODIFY `cloud_color_r` float(9,8) unsigned NOT NULL DEFAULT '0.41',
+MODIFY `cloud_color_g` float(9,8) unsigned NOT NULL DEFAULT '0.41',
+MODIFY `cloud_color_b` float(9,8) unsigned NOT NULL DEFAULT '0.41',
+MODIFY `cloud_color_i` float(9,8) unsigned NOT NULL DEFAULT '0.41',
+MODIFY `cloud_x` float(9,8) unsigned NOT NULL DEFAULT '1.00',
+MODIFY `cloud_y` float(9,8) unsigned NOT NULL DEFAULT '0.53',
+MODIFY `cloud_density` float(9,8) unsigned NOT NULL DEFAULT '1.00',
+MODIFY `cloud_coverage` float(9,8) unsigned NOT NULL DEFAULT '0.27',
+MODIFY `cloud_scale` float(9,8) unsigned NOT NULL DEFAULT '0.42',
+MODIFY `cloud_detail_x` float(9,8) unsigned NOT NULL DEFAULT '1.00',
+MODIFY `cloud_detail_y` float(9,8) unsigned NOT NULL DEFAULT '0.53',
+MODIFY `cloud_detail_density` float(9,8) unsigned NOT NULL DEFAULT '0.12',
+MODIFY `cloud_scroll_x` float(9,7) NOT NULL DEFAULT '0.20',
+MODIFY `cloud_scroll_y` float(9,7) NOT NULL DEFAULT '0.01';
+
+COMMIT;
+
+:VERSION 56         #----- Add RezzerID field in table prims
+
+BEGIN;
+
+ALTER TABLE `prims` ADD COLUMN `RezzerID` char(36) DEFAULT NULL;
+
+COMMIT;
+
+:VERSION 57         #----- Add physics inertia data
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `PhysInertia` TEXT default NULL;
 COMMIT;
-
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
index 97e5e4f..98be097 100644
--- a/OpenSim/Data/MySQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -1,47 +1,31 @@
-:VERSION 1           # -------------------------
+:VERSION 5           # -------------------------
 
 BEGIN;
 
-CREATE TABLE `UserAccounts` (
-    `PrincipalID` CHAR(36) NOT NULL,
-    `ScopeID` CHAR(36) NOT NULL,
-    `FirstName` VARCHAR(64) NOT NULL,
-    `LastName` VARCHAR(64) NOT NULL,
-    `Email` VARCHAR(64),
-    `ServiceURLs` TEXT,
-    `Created` INT(11)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+CREATE TABLE IF NOT EXISTS `UserAccounts` (
+  `PrincipalID` char(36) NOT NULL,
+  `ScopeID` char(36) NOT NULL,
+  `FirstName` varchar(64) NOT NULL,
+  `LastName` varchar(64) NOT NULL,
+  `Email` varchar(64) DEFAULT NULL,
+  `ServiceURLs` text,
+  `Created` int(11) DEFAULT NULL,
+  `UserLevel` int(11) NOT NULL DEFAULT '0',
+  `UserFlags` int(11) NOT NULL DEFAULT '0',
+  `UserTitle` varchar(64) NOT NULL DEFAULT '',
+  UNIQUE KEY `PrincipalID` (`PrincipalID`),
+  KEY `Email` (`Email`),
+  KEY `FirstName` (`FirstName`),
+  KEY `LastName` (`LastName`),
+  KEY `Name` (`FirstName`,`LastName`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
-:VERSION 2              # -------------------------
+:VERSION 6              # -------------------------
 
 BEGIN;
 
-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, CONCAT('AssetServerURI=', userAssetURI, ' InventoryServerURI=', userInventoryURI, ' GatewayURI= HomeURI=') AS ServiceURLs, created as Created FROM users;
+ALTER TABLE `UserAccounts` ADD `active` INT NOT NULL DEFAULT '1';
 
 COMMIT;
-
-:VERSION 3              # -------------------------
-
-BEGIN;
-
-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;
-
-ALTER TABLE UserAccounts ADD COLUMN UserLevel integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD COLUMN UserFlags integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD COLUMN UserTitle varchar(64) NOT NULL DEFAULT '';
-
-COMMIT;
-
-
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index 0759b26..cfcc18b 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -1,4 +1,4 @@
-:VERSION 1         # -------------------------------
+:VERSION 5         # -------------------------------
 
 begin;
 
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `classifieds` (
   `classifiedflags` int(8) NOT NULL,
   `priceforlisting` int(5) NOT NULL,
   PRIMARY KEY (`classifieduuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `usernotes` (
@@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` (
   `targetuuid` varchar(36) NOT NULL,
   `notes` text NOT NULL,
   UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userpicks` (
@@ -44,8 +44,9 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
   `posglobal` varchar(255) NOT NULL,
   `sortorder` int(2) NOT NULL,
   `enabled` enum('true','false') NOT NULL,
+  `gatekeeper` varchar(255),
   PRIMARY KEY (`pickuuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE IF NOT EXISTS `userprofile` (
@@ -64,35 +65,22 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
   `profileFirstImage` varchar(36) NOT NULL,
   `profileFirstText` text NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-commit;
-
-:VERSION 2         # -------------------------------
- 
-begin;
 CREATE TABLE IF NOT EXISTS `userdata` (
     `UserId` char(36) NOT NULL,
     `TagId` varchar(64) NOT NULL,
     `DataKey` varchar(255),
     `DataVal` varchar(255),
     PRIMARY KEY (`UserId`,`TagId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-commit;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-:VERSION 3         # -------------------------------
-begin;
 CREATE TABLE IF NOT EXISTS `usersettings` (
   `useruuid` varchar(36) NOT NULL,
   `imviaemail` enum('true','false') NOT NULL,
   `visible` enum('true','false') NOT NULL,
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
-:VERSION 4         # -------------------------------
-begin;
-ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
 commit;
diff --git a/OpenSim/Data/MySQL/Resources/UserStore.migrations b/OpenSim/Data/MySQL/Resources/UserStore.migrations
deleted file mode 100644
index 9129075..0000000
--- a/OpenSim/Data/MySQL/Resources/UserStore.migrations
+++ /dev/null
@@ -1,168 +0,0 @@
-:VERSION 1          # -----------------------------
-
-BEGIN;
-
-SET FOREIGN_KEY_CHECKS=0;
--- ----------------------------
--- Table structure for agents
--- ----------------------------
-CREATE TABLE `agents` (
-  `UUID` varchar(36) NOT NULL,
-  `sessionID` varchar(36) NOT NULL,
-  `secureSessionID` varchar(36) NOT NULL,
-  `agentIP` varchar(16) NOT NULL,
-  `agentPort` int(11) NOT NULL,
-  `agentOnline` tinyint(4) NOT NULL,
-  `loginTime` int(11) NOT NULL,
-  `logoutTime` int(11) NOT NULL,
-  `currentRegion` varchar(36) NOT NULL,
-  `currentHandle` bigint(20) unsigned NOT NULL,
-  `currentPos` varchar(64) NOT NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `session` (`sessionID`),
-  UNIQUE KEY `ssession` (`secureSessionID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- Create schema avatar_appearance
---
-
-CREATE TABLE `avatarappearance` (
-  Owner char(36) NOT NULL,
-  Serial int(10) unsigned NOT NULL,
-  Visual_Params blob NOT NULL,
-  Texture blob NOT NULL,
-  Avatar_Height float NOT NULL,
-  Body_Item char(36) NOT NULL,
-  Body_Asset char(36) NOT NULL,
-  Skin_Item char(36) NOT NULL,
-  Skin_Asset char(36) NOT NULL,
-  Hair_Item char(36) NOT NULL,
-  Hair_Asset char(36) NOT NULL,
-  Eyes_Item char(36) NOT NULL,
-  Eyes_Asset char(36) NOT NULL,
-  Shirt_Item char(36) NOT NULL,
-  Shirt_Asset char(36) NOT NULL,
-  Pants_Item char(36) NOT NULL,
-  Pants_Asset char(36) NOT NULL,
-  Shoes_Item char(36) NOT NULL,
-  Shoes_Asset char(36) NOT NULL,
-  Socks_Item char(36) NOT NULL,
-  Socks_Asset char(36) NOT NULL,
-  Jacket_Item char(36) NOT NULL,
-  Jacket_Asset char(36) NOT NULL,
-  Gloves_Item char(36) NOT NULL,
-  Gloves_Asset char(36) NOT NULL,
-  Undershirt_Item char(36) NOT NULL,
-  Undershirt_Asset char(36) NOT NULL,
-  Underpants_Item char(36) NOT NULL,
-  Underpants_Asset char(36) NOT NULL,
-  Skirt_Item char(36) NOT NULL,
-  Skirt_Asset char(36) NOT NULL,
-  PRIMARY KEY  (`Owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-SET FOREIGN_KEY_CHECKS=0;
--- ----------------------------
--- Table structure for users
--- ----------------------------
-CREATE TABLE `userfriends` (
-   `ownerID` VARCHAR(37) NOT NULL,
-   `friendID` VARCHAR(37) NOT NULL,
-   `friendPerms` INT NOT NULL,
-   `datetimestamp` INT NOT NULL,
-         UNIQUE KEY  (`ownerID`, `friendID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- ----------------------------
--- Table structure for users
--- ----------------------------
-CREATE TABLE `users` (
-  `UUID` varchar(36) NOT NULL default '',
-  `username` varchar(32) NOT NULL,
-  `lastname` varchar(32) NOT NULL,
-  `passwordHash` varchar(32) NOT NULL,
-  `passwordSalt` varchar(32) NOT NULL,
-  `homeRegion` bigint(20) unsigned default NULL,
-  `homeLocationX` float default NULL,
-  `homeLocationY` float default NULL,
-  `homeLocationZ` float default NULL,
-  `homeLookAtX` float default NULL,
-  `homeLookAtY` float default NULL,
-  `homeLookAtZ` float default NULL,
-  `created` int(11) NOT NULL,
-  `lastLogin` int(11) NOT NULL,
-  `userInventoryURI` varchar(255) default NULL,
-  `userAssetURI` varchar(255) default NULL,
-  `profileCanDoMask` int(10) unsigned default NULL,
-  `profileWantDoMask` int(10) unsigned default NULL,
-  `profileAboutText` text,
-  `profileFirstText` text,
-  `profileImage` varchar(36) default NULL,
-  `profileFirstImage` varchar(36) default NULL,
-  `webLoginKey` varchar(36) default NULL,
-  PRIMARY KEY  (`UUID`),
-  UNIQUE KEY `usernames` (`username`,`lastname`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Records 
--- ----------------------------
-COMMIT;
-
-:VERSION 2          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE users add homeRegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 3          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE users add userFlags integer NOT NULL default 0;
-ALTER TABLE users add godLevel integer NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 4          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE users add customType varchar(32) not null default '';
-ALTER TABLE users add partner char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 5          # -----------------------------
-
-BEGIN;
-
-CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=MyISAM;
-
-COMMIT;
-
-:VERSION 6          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE agents add currentLookAt varchar(36) not null default '';
-
-COMMIT;
-
-:VERSION 7          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE users add email varchar(250);
-
-COMMIT;
-
-:VERSION 8          # -----------------------------
-
-BEGIN;
-
-ALTER TABLE users add scopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index 78d6e51..9459e3e 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -16,13 +16,13 @@ CREATE TABLE `XAssetsMeta` (
   `AssetFlags` int(11) NOT NULL,
   `CreatorID` varchar(128) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
 CREATE TABLE `XAssetsData` (
   `Hash` binary(32) NOT NULL,
   `Data` longblob NOT NULL,
   PRIMARY KEY (`hash`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/XMute.migrations b/OpenSim/Data/MySQL/Resources/XMute.migrations
new file mode 100644
index 0000000..4ac7f82
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/XMute.migrations
@@ -0,0 +1,16 @@
+:VERSION 1
+
+BEGIN;
+
+CREATE TABLE `XMute` (
+  `AgentID` char(36) NOT NULL,
+  `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+  `MuteName` varchar(64) NOT NULL DEFAULT '',
+  `MuteType` int(11) NOT NULL DEFAULT '1',
+  `MuteFlags` int(11) NOT NULL DEFAULT '0',
+  `Stamp` int(11) NOT NULL,
+  UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
+  KEY `AgentID` (`AgentID`)
+);
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
index 9e6f1c1..6ec8914 100644
--- a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
@@ -31,7 +31,7 @@ CREATE TABLE `os_groups_membership` (
   `AccessToken` char(36) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 
 CREATE TABLE `os_groups_roles` (
@@ -43,7 +43,7 @@ CREATE TABLE `os_groups_roles` (
   `Powers` bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (`GroupID`,`RoleID`),
   KEY `GroupID` (`GroupID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 
 CREATE TABLE `os_groups_rolemembership` (
@@ -52,7 +52,7 @@ CREATE TABLE `os_groups_rolemembership` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`RoleID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 
 CREATE TABLE `os_groups_invites` (
@@ -63,7 +63,7 @@ CREATE TABLE `os_groups_invites` (
   `TMStamp` timestamp NOT NULL,
   PRIMARY KEY  (`InviteID`),
   UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 
 CREATE TABLE `os_groups_notices` (
@@ -81,13 +81,13 @@ CREATE TABLE `os_groups_notices` (
   PRIMARY KEY  (`NoticeID`),
   KEY  `GroupID` (`GroupID`),
   KEY `TMStamp` (`TMStamp`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE `os_groups_principals` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   `ActiveGroupID` char(36) NOT NULL default '',
   PRIMARY KEY  (`PrincipalID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 COMMIT;
 
@@ -112,4 +112,4 @@ DROP TABLE `diva_groups_principals`;
 
 DELETE FROM `migrations` WHERE name='diva_im_Store';
 
-COMMIT;
\ No newline at end of file
+COMMIT;
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 57592f1..9f22896 100644..100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -102,19 +102,19 @@ namespace OpenSim.Data.Null
         {
             return new EstateSettings();
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> allEstateSettings = new List<EstateSettings>();
             allEstateSettings.Add(GetEstate());
             return allEstateSettings;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
             result.Add((int)GetEstate().EstateID);
-            return result;            
+            return result;
         }
 
         public List<int> GetEstates(string search)
diff --git a/OpenSim/Data/Null/NullFriendsData.cs b/OpenSim/Data/Null/NullFriendsData.cs
index 473999f..dc9cd38 100644
--- a/OpenSim/Data/Null/NullFriendsData.cs
+++ b/OpenSim/Data/Null/NullFriendsData.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Data.Null
                 {
                     return fdata.PrincipalID == userID.ToString();
                 });
-    
+
                 if (lst != null)
                 {
                     lst.ForEach(f =>
@@ -87,14 +87,14 @@ namespace OpenSim.Data.Null
                         FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
                         if (f2 != null)
                             f.Data["TheirFlags"] = f2.Data["Flags"];
-    
+
     //                    m_log.DebugFormat(
     //                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
     //                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
                     });
-    
+
     //                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
-    
+
                     return lst.ToArray();
                 }
             }
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Null
     //                    m_log.DebugFormat(
     //                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
     //                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
-    
+
                         m_Data.Remove(friend);
                         return true;
                     }
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index aff0b0b..8c442c9 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Null
     public class NullPresenceData : IPresenceData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public static NullPresenceData Instance;
 
         Dictionary<UUID, PresenceData> m_presenceData = new Dictionary<UUID, PresenceData>();
@@ -100,7 +100,7 @@ namespace OpenSim.Data.Null
         {
             if (Instance != this)
                 return Instance.ReportAgent(sessionID, regionID);
-            
+
             if (m_presenceData.ContainsKey(sessionID))
             {
                 m_presenceData[sessionID].RegionID = regionID;
@@ -129,7 +129,7 @@ namespace OpenSim.Data.Null
 //                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
                     }
                 }
-                
+
                 return presences.ToArray();
             }
             else if (field == "SessionID")
@@ -172,7 +172,7 @@ namespace OpenSim.Data.Null
         {
 //            m_log.DebugFormat(
 //                "[NULL PRESENCE DATA]: Deleting presence data for field {0} with parameter {1}", field, data);
-            
+
             if (Instance != this)
                 return Instance.Delete(field, data);
 
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index d28cd99..595db2f 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -134,21 +134,22 @@ namespace OpenSim.Data.Null
             if (m_useStaticInstance && Instance != this)
                 return Instance.Get(posX, posY, scopeID);
 
-            List<RegionData> ret = new List<RegionData>();
+            RegionData ret = null;
 
             lock (m_regionData)
             {
                 foreach (RegionData r in m_regionData.Values)
                 {
-                    if (r.posX == posX && r.posY == posY)
-                        ret.Add(r);
+                    if (posX >= r.posX && posX < r.posX + r.sizeX
+                        && posY >= r.posY && posY < r.posY + r.sizeY)
+                    {
+                        ret = r;
+                        break;
+                    }
                 }
             }
 
-            if (ret.Count > 0)
-                return ret[0];
-
-            return null;
+            return ret;
         }
 
         public RegionData Get(UUID regionID, UUID scopeID)
@@ -176,8 +177,9 @@ namespace OpenSim.Data.Null
             {
                 foreach (RegionData r in m_regionData.Values)
                 {
-                    if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
-                        ret.Add(r);
+                    if (r.posX + r.sizeX > startX && r.posX <= endX
+                         && r.posY + r.sizeX > startY && r.posY <= endY)
+                         ret.Add(r);
                 }
             }
 
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index deeaced..7bb6da3 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -133,6 +133,7 @@ namespace OpenSim.Data.Null
         }
 
         Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>();
+        Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>();
         public void StoreTerrain(TerrainData ter, UUID regionID)
         {
             if (m_terrains.ContainsKey(regionID))
@@ -140,6 +141,13 @@ namespace OpenSim.Data.Null
             m_terrains.Add(regionID, ter);
         }
 
+        public void StoreBakedTerrain(TerrainData ter, UUID regionID)
+        {
+            if (m_bakedterrains.ContainsKey(regionID))
+                m_bakedterrains.Remove(regionID);
+            m_bakedterrains.Add(regionID, ter);
+        }
+
         // Legacy. Just don't do this.
         public void StoreTerrain(double[,] ter, UUID regionID)
         {
@@ -167,6 +175,15 @@ namespace OpenSim.Data.Null
             return null;
         }
 
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            if (m_bakedterrains.ContainsKey(regionID))
+            {
+                return m_bakedterrains[regionID];
+            }
+            return null;
+        }
+
         public void RemoveLandObject(UUID globalID)
         {
         }
@@ -184,6 +201,11 @@ namespace OpenSim.Data.Null
         {
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index ec54dba..6d2e05a 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Data.Null
     public class NullUserAccountData : IUserAccountData
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private Dictionary<UUID, UserAccountData> m_DataByUUID = new Dictionary<UUID, UserAccountData>();
         private Dictionary<string, UserAccountData> m_DataByName = new Dictionary<string, UserAccountData>();
         private Dictionary<string, UserAccountData> m_DataByEmail = new Dictionary<string, UserAccountData>();
@@ -48,7 +48,7 @@ namespace OpenSim.Data.Null
         public NullUserAccountData(string connectionString, string realm)
         {
 //            m_log.DebugFormat(
-//                "[NULL USER ACCOUNT DATA]: Initializing new NullUserAccountData with connectionString [{0}], realm [{1}]", 
+//                "[NULL USER ACCOUNT DATA]: Initializing new NullUserAccountData with connectionString [{0}], realm [{1}]",
 //                connectionString, realm);
         }
 
@@ -65,12 +65,12 @@ namespace OpenSim.Data.Null
 //            if (m_log.IsDebugEnabled)
 //            {
 //                m_log.DebugFormat(
-//                    "[NULL USER ACCOUNT DATA]: Called Get with fields [{0}], values [{1}]", 
+//                    "[NULL USER ACCOUNT DATA]: Called Get with fields [{0}], values [{1}]",
 //                    string.Join(", ", fields), string.Join(", ", values));
 //            }
-            
+
             UserAccountData[] userAccounts = new UserAccountData[0];
-            
+
             List<string> fieldsLst = new List<string>(fields);
             if (fieldsLst.Contains("PrincipalID"))
             {
@@ -79,33 +79,33 @@ namespace OpenSim.Data.Null
                 if (UUID.TryParse(values[i], out id))
                     if (m_DataByUUID.ContainsKey(id))
                         userAccounts = new UserAccountData[] { m_DataByUUID[id] };
-            }            
+            }
             else if (fieldsLst.Contains("FirstName") && fieldsLst.Contains("LastName"))
             {
                 int findex = fieldsLst.IndexOf("FirstName");
                 int lindex = fieldsLst.IndexOf("LastName");
                 if (m_DataByName.ContainsKey(values[findex] + " " + values[lindex]))
-                {                                       
+                {
                     userAccounts = new UserAccountData[] { m_DataByName[values[findex] + " " + values[lindex]] };
                 }
-            }            
+            }
             else if (fieldsLst.Contains("Email"))
             {
                 int i = fieldsLst.IndexOf("Email");
                 if (m_DataByEmail.ContainsKey(values[i]))
                     userAccounts = new UserAccountData[] { m_DataByEmail[values[i]] };
             }
-            
+
 //            if (m_log.IsDebugEnabled)
 //            {
 //                StringBuilder sb = new StringBuilder();
 //                foreach (UserAccountData uad in userAccounts)
 //                    sb.AppendFormat("({0} {1} {2}) ", uad.FirstName, uad.LastName, uad.PrincipalID);
-//                    
+//
 //                m_log.DebugFormat(
 //                    "[NULL USER ACCOUNT DATA]: Returning {0} user accounts out of {1}: [{2}]", userAccounts.Length, m_DataByName.Count, sb);
 //            }
-            
+
             return userAccounts;
         }
 
@@ -113,16 +113,16 @@ namespace OpenSim.Data.Null
         {
             if (data == null)
                 return false;
-                       
+
             m_log.DebugFormat(
-                "[NULL USER ACCOUNT DATA]: Storing user account {0} {1} {2} {3}", 
+                "[NULL USER ACCOUNT DATA]: Storing user account {0} {1} {2} {3}",
                 data.FirstName, data.LastName, data.PrincipalID, this.GetHashCode());
-            
+
             m_DataByUUID[data.PrincipalID] = data;
             m_DataByName[data.FirstName + " " + data.LastName] = data;
             if (data.Data.ContainsKey("Email") && data.Data["Email"] != null && data.Data["Email"] != string.Empty)
                 m_DataByEmail[data.Data["Email"]] = data;
-            
+
 //            m_log.DebugFormat("m_DataByUUID count is {0}, m_DataByName count is {1}", m_DataByUUID.Count, m_DataByName.Count);
 
             return true;
@@ -132,7 +132,7 @@ namespace OpenSim.Data.Null
         {
 //            m_log.DebugFormat(
 //                "[NULL USER ACCOUNT DATA]: Called GetUsers with scope [{0}], query [{1}]", scopeID, query);
-            
+
             string[] words = query.Split(new char[] { ' ' });
 
             for (int i = 0; i < words.Length; i++)
@@ -193,5 +193,10 @@ namespace OpenSim.Data.Null
 
             return false;
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
index a827bd0..508f1c7 100644
--- a/OpenSim/Data/Null/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
@@ -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.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
diff --git a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
index 20612fe..4794c71 100644
--- a/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAgentPreferencesData.cs
@@ -44,20 +44,12 @@ namespace OpenSim.Data.PGSQL
 
         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;
+            AgentPreferencesData[] ret = Get("PrincipalID", agentID.ToString());
 
-            //return ret[0];
-        }
-
-        public override bool Store(AgentPreferencesData row)
-        {
-            // Until someone sends in a table that works
-            return false;
+            if (ret.Length == 0)
+                return null;
+            return ret[0];
         }
 
     }
diff --git a/OpenSim/Data/PGSQL/PGSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
index 5d8b0a2..7b79521 100644
--- a/OpenSim/Data/PGSQL/PGSQLAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs
@@ -149,37 +149,37 @@ namespace OpenSim.Data.PGSQL
         /// Create asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
-           
+
             string sql =
                 @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType,
                          local = :local, temporary = :temporary, creatorid = :creatorid, data = :data
                     WHERE id=:id;
 
                   INSERT INTO assets
-                    (id, name, description, " + "\"assetType\" " + @", local, 
+                    (id, name, description, " + "\"assetType\" " + @", local,
                      temporary, create_time, access_time, creatorid, asset_flags, data)
-                  Select :id, :name, :description, :assetType, :local, 
+                  Select :id, :name, :description, :assetType, :local,
                          :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data
-                   Where not EXISTS(SELECT * FROM assets WHERE id=:id) 
+                   Where not EXISTS(SELECT * FROM assets WHERE id=:id)
                 ";
-            
+
             string assetName = asset.Name;
             if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
             {
                 assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[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 > AssetBase.MAX_ASSET_DESC)
             {
                 assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
 
@@ -208,6 +208,7 @@ namespace OpenSim.Data.PGSQL
                     m_log.Error("[ASSET DB]: Error storing item :" + e.Message + " sql "+sql);
                 }
             }
+            return true;
         }
 
 
@@ -277,7 +278,7 @@ namespace OpenSim.Data.PGSQL
         {
             List<AssetMetadata> retList = new List<AssetMetadata>(count);
             string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid
-                              FROM assets 
+                              FROM assets
                              order by id
                              limit :stop
                             offset :start;";
diff --git a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
index d174112..8f83309 100644
--- a/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Data.PGSQL
                     updateBuilder.AppendFormat("\"{0}\" = :{0}",field);
 
                     first = false;
-                    
+
                     cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
                 }
 
@@ -154,7 +154,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.CommandText = updateBuilder.ToString();
                 cmd.Connection = conn;
                 cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
-                
+
                 conn.Open();
                 if (cmd.ExecuteNonQuery() < 1)
                 {
@@ -195,7 +195,7 @@ namespace OpenSim.Data.PGSQL
         {
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
-            
+
             string sql = "insert into tokens (uuid, token, validity) values (:principalID, :token, :lifetime)";
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
diff --git a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
index d9c4905..3d56d4d 100644
--- a/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAvatarData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.PGSQL
             IAvatarData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public PGSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
         {
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index b5ca235..9489d6c 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -594,7 +594,7 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteEstate(int estateID)
         {
-            // TODO: Implementation!            
+            // TODO: Implementation!
             return false;
         }
         #endregion
diff --git a/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs b/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs
new file mode 100644
index 0000000..59b857c
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLFSAssetData.cs
@@ -0,0 +1,316 @@
+/*
+ * 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.Reflection;
+using System.Collections.Generic;
+using System.Data;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using log4net;
+using OpenMetaverse;
+using Npgsql;
+using NpgsqlTypes;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLFSAssetData : IFSAssetDataPlugin
+    {
+        private const string _migrationStore = "FSAssetStore";
+        private static string m_Table = "fsassets";
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private long m_ticksToEpoch;
+
+        private PGSQLManager m_database;
+        private string m_connectionString;
+
+        public PGSQLFSAssetData()
+        {
+        }
+
+        public void Initialise(string connect, string realm, int UpdateAccessTime)
+        {
+            DaysBetweenAccessTimeUpdates = UpdateAccessTime;
+
+            m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
+
+            m_connectionString = connect;
+            m_database = new PGSQLManager(m_connectionString);
+
+            //New migration to check for DB changes
+            m_database.CheckMigration(_migrationStore);
+        }
+
+        public void Initialise()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Number of days that must pass before we update the access time on an asset when it has been fetched
+        /// Config option to change this is "DaysBetweenAccessTimeUpdates"
+        /// </summary>
+        private int DaysBetweenAccessTimeUpdates = 0;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        
+        #region IPlugin Members
+
+        public string Version { get { return "1.0.0.0"; } }
+
+        public void Dispose() { }
+
+        public string Name
+        {
+            get { return "PGSQL FSAsset storage engine"; }
+        }
+
+        #endregion
+
+        #region IFSAssetDataPlugin Members
+
+        public AssetMetadata Get(string id, out string hash)
+        {
+            hash = String.Empty;
+            AssetMetadata meta = null;
+            UUID uuid = new UUID(id);
+
+            string query = String.Format("select \"id\", \"type\", \"hash\", \"create_time\", \"access_time\", \"asset_flags\" from {0} where \"id\" = :id", m_Table);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+            {
+                dbcon.Open();
+                cmd.Parameters.Add(m_database.CreateParameter("id", uuid));
+                using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                {
+                    if (reader.Read())
+                    {
+                        meta = new AssetMetadata();
+                        hash = reader["hash"].ToString();
+                        meta.ID = id;
+                        meta.FullID = uuid;
+                        meta.Name = String.Empty;
+                        meta.Description = String.Empty;
+                        meta.Type = (sbyte)Convert.ToInt32(reader["type"]);
+                        meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                        meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+                        meta.Flags = (AssetFlags)Convert.ToInt32(reader["asset_flags"]);
+                        int atime = Convert.ToInt32(reader["access_time"]);
+                        UpdateAccessTime(atime, uuid);
+                    }
+                }
+            }
+
+            return meta;
+        }
+
+        private void UpdateAccessTime(int AccessTime, UUID id)
+        {
+            // Reduce DB work by only updating access time if asset hasn't recently been accessed
+            // 0 By Default, Config option is "DaysBetweenAccessTimeUpdates"
+            if (DaysBetweenAccessTimeUpdates > 0 && (DateTime.UtcNow - Utils.UnixTimeToDateTime(AccessTime)).TotalDays < DaysBetweenAccessTimeUpdates)
+                return;
+
+            string query = String.Format("UPDATE {0} SET \"access_time\" = :access_time WHERE \"id\" = :id", m_Table);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+            {
+                dbcon.Open();
+                int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+                cmd.Parameters.Add(m_database.CreateParameter("id", id));
+                cmd.Parameters.Add(m_database.CreateParameter("access_time", now));
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public bool Store(AssetMetadata meta, string hash)
+        {
+            try
+            {
+                bool found = false;
+                string oldhash;
+                AssetMetadata existingAsset = Get(meta.ID, out oldhash);
+
+                string query = String.Format("UPDATE {0} SET \"access_time\" = :access_time WHERE \"id\" = :id", m_Table);
+                if (existingAsset == null)
+                {
+                   query = String.Format("insert into {0} (\"id\", \"type\", \"hash\", \"asset_flags\", \"create_time\", \"access_time\") values ( :id, :type, :hash, :asset_flags, :create_time, :access_time)", m_Table);
+                   found = true;
+                }
+
+                using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+                {
+                    dbcon.Open();
+                    int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
+                    cmd.Parameters.Add(m_database.CreateParameter("id", meta.FullID));
+                    cmd.Parameters.Add(m_database.CreateParameter("type", meta.Type));
+                    cmd.Parameters.Add(m_database.CreateParameter("hash", hash));
+                    cmd.Parameters.Add(m_database.CreateParameter("asset_flags", Convert.ToInt32(meta.Flags)));
+                    cmd.Parameters.Add(m_database.CreateParameter("create_time", now));
+                    cmd.Parameters.Add(m_database.CreateParameter("access_time", now));
+                    cmd.ExecuteNonQuery();
+                }
+                return found;
+            }
+            catch(Exception e)
+            {
+                m_log.Error("[PGSQL FSASSETS] Failed to store asset with ID " + meta.ID);
+                        m_log.Error(e.ToString());
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Check if the assets exist in the database.
+        /// </summary>
+        /// <param name="uuids">The asset UUID's</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> exists = new HashSet<UUID>();
+
+            string ids = "'" + string.Join("','", uuids) + "'";
+            string query = string.Format("select \"id\" from {1} where id in ({0})", ids, m_Table);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+            {
+                dbcon.Open();
+                using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                {
+                    while (reader.Read())
+                    {
+                        UUID id = DBGuid.FromDB(reader["id"]);;
+                        exists.Add(id);
+                    }
+                }
+            }
+
+            bool[] results = new bool[uuids.Length];
+            for (int i = 0; i < uuids.Length; i++)
+                results[i] = exists.Contains(uuids[i]);
+            return results;
+        }
+
+        public int Count()
+        {
+            int count = 0;
+            string query = String.Format("select count(*) as count from {0}", m_Table);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+            {
+                dbcon.Open();
+                IDataReader reader = cmd.ExecuteReader();
+                reader.Read();
+                count = Convert.ToInt32(reader["count"]);
+                reader.Close();
+            }
+
+            return count;
+        }
+
+        public bool Delete(string id)
+        {
+            string query = String.Format("delete from {0} where \"id\" = :id", m_Table);
+            using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
+            {
+                dbcon.Open();
+                cmd.Parameters.Add(m_database.CreateParameter("id", new UUID(id)));
+                cmd.ExecuteNonQuery();
+            }
+
+            return true;
+        }
+
+        public void Import(string conn, string table, int start, int count, bool force, FSStoreDelegate store)
+        {
+            int imported = 0;
+            string limit = String.Empty;
+            if(count != -1)
+            {
+                limit = String.Format(" limit {0} offset {1}", start, count);
+            }
+            string query = String.Format("select * from {0}{1}", table, limit);
+            try
+            {
+                using (NpgsqlConnection remote = new NpgsqlConnection(conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(query, remote))
+                {
+                    remote.Open();
+                    MainConsole.Instance.Output("Querying database");
+                    MainConsole.Instance.Output("Reading data");
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                    {
+                        while (reader.Read())
+                        {
+                            if ((imported % 100) == 0)
+                            {
+                                MainConsole.Instance.Output(String.Format("{0} assets imported so far", imported));
+                            }
+    
+                            AssetBase asset = new AssetBase();
+                            AssetMetadata meta = new AssetMetadata();
+
+                            meta.ID = reader["id"].ToString();
+                            meta.FullID = new UUID(meta.ID);
+
+                            meta.Name = String.Empty;
+                            meta.Description = String.Empty;
+                            meta.Type = (sbyte)Convert.ToInt32(reader["assetType"]);
+                            meta.ContentType = SLUtil.SLAssetTypeToContentType(meta.Type);
+                            meta.CreationDate = Util.ToDateTime(Convert.ToInt32(reader["create_time"]));
+
+                            asset.Metadata = meta;
+                            asset.Data = (byte[])reader["data"];
+
+                            store(asset, force);
+
+                            imported++;
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[PGSQL FSASSETS]: Error importing assets: {0}",
+                        e.Message.ToString());
+                return;
+            }
+
+            MainConsole.Instance.Output(String.Format("Import done, {0} assets imported", imported));
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
index a841353..58dffed 100644
--- a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
-        
+
         public override bool Delete(string principalID, string friend)
         {
             UUID princUUID = UUID.Zero;
@@ -97,7 +97,7 @@ namespace OpenSim.Data.PGSQL
             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 " + 
+                cmd.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " +
                                                 " left join {0} as b on a.\"PrincipalID\" = b.\"Friend\" and a.\"Friend\" = b.\"PrincipalID\" " +
                                                 " where a.\"PrincipalID\" = :PrincipalID", m_Realm);
                 cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
@@ -111,6 +111,6 @@ namespace OpenSim.Data.PGSQL
         {
             return GetFriends(principalID);
         }
- 
+
     }
 }
diff --git a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
index 826c6fc..5b24720 100644
--- a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Data.PGSQL
             : base(connectionString)
         {
             m_Realm = realm;
-            
+
             m_ConnectionString = connectionString;
 
             if (storeName != String.Empty)
@@ -104,7 +104,7 @@ namespace OpenSim.Data.PGSQL
             m_FieldTypes = new Dictionary<string, string>();
 
             string query = string.Format(@"select column_name,data_type
-                        from INFORMATION_SCHEMA.COLUMNS 
+                        from INFORMATION_SCHEMA.COLUMNS
                        where table_name = lower('{0}');
 
                 ", m_Realm);
@@ -145,27 +145,22 @@ namespace OpenSim.Data.PGSQL
         private List<string> GetConstraints()
         {
             List<string> constraints = new List<string>();
-            string query = string.Format(@"SELECT kcu.column_name
-                        FROM information_schema.table_constraints tc
-                        LEFT JOIN information_schema.key_column_usage kcu
-                        ON tc.constraint_catalog = kcu.constraint_catalog
-                        AND tc.constraint_schema = kcu.constraint_schema
-                        AND tc.constraint_name = kcu.constraint_name
-
-                        LEFT JOIN information_schema.referential_constraints rc
-                        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);
+            string query = string.Format(@"select
+                    a.attname as column_name
+                from
+                    pg_class t,
+                    pg_class i,
+                    pg_index ix,
+                    pg_attribute a
+                where
+                    t.oid = ix.indrelid
+                    and i.oid = ix.indexrelid
+                    and a.attrelid = t.oid
+                    and a.attnum = ANY(ix.indkey)
+                    and t.relkind = 'r'
+                    and ix.indisunique = true
+                    and t.relname = lower('{0}')
+            ;", m_Realm);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(query, conn))
@@ -237,7 +232,7 @@ namespace OpenSim.Data.PGSQL
                 if (reader == null)
                     return new T[0];
 
-                CheckColumnNames(reader);                
+                CheckColumnNames(reader);
 
                 while (reader.Read())
                 {
@@ -344,7 +339,7 @@ namespace OpenSim.Data.PGSQL
                     names.Add(fi.Name);
                     values.Add(":" + fi.Name);
                     // Temporarily return more information about what field is unexpectedly null for
-                    // http://opensimulator.org/mantis/view.php?id=5403.  This might be due to a bug in the 
+                    // 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(
@@ -400,11 +395,11 @@ namespace OpenSim.Data.PGSQL
                     }
                     string where = String.Join(" AND ", terms.ToArray());
                     query.AppendFormat(" WHERE {0} ", where);
-                    
+
                 }
                 cmd.Connection = conn;
                 cmd.CommandText = query.ToString();
-                
+
                 conn.Open();
                 if (cmd.ExecuteNonQuery() > 0)
                 {
@@ -421,7 +416,7 @@ namespace OpenSim.Data.PGSQL
                     query.Append("\") values (" + String.Join(",", values.ToArray()) + ")");
                     cmd.Connection = conn;
                     cmd.CommandText = query.ToString();
-                    
+
                     // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText);
 
                     if (conn.State != ConnectionState.Open)
diff --git a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
index e257e7c..f398256 100644..100755
--- a/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLGroupsData.cs
@@ -37,7 +37,7 @@ using Npgsql;
 namespace OpenSim.Data.PGSQL
 {
     public class PGSQLGroupsData : IGroupsData
-    {        
+    {
         private PGSqlGroupsGroupsHandler m_Groups;
         private PGSqlGroupsMembershipHandler m_Membership;
         private PGSqlGroupsRolesHandler m_Roles;
@@ -83,17 +83,17 @@ namespace OpenSim.Data.PGSQL
 
         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   
-            {             
+            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));
             }
         }
@@ -138,10 +138,10 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteMember(UUID groupID, string pricipalID)
         {
-            return m_Membership.Delete(new string[] { "GroupID", "PrincipalID" }, 
+            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());
@@ -173,7 +173,7 @@ namespace OpenSim.Data.PGSQL
 
         public bool DeleteRole(UUID groupID, UUID roleID)
         {
-            return m_Roles.Delete(new string[] { "GroupID", "RoleID" }, 
+            return m_Roles.Delete(new string[] { "GroupID", "RoleID" },
                                   new string[] { groupID.ToString(), roleID.ToString() });
         }
 
@@ -365,7 +365,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store) 
+        public PGSqlGroupsGroupsHandler(string connectionString, string realm, string store)
             : base(connectionString, realm, store)
         {
         }
@@ -380,7 +380,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsMembershipHandler(string connectionString, string realm) 
+        public PGSqlGroupsMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -395,7 +395,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsRolesHandler(string connectionString, string realm) 
+        public PGSqlGroupsRolesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -410,7 +410,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm) 
+        public PGSqlGroupsRoleMembershipHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -425,7 +425,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsInvitesHandler(string connectionString, string realm) 
+        public PGSqlGroupsInvitesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -435,8 +435,8 @@ namespace OpenSim.Data.PGSQL
 
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
-                
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\"::abstime::timestamp < now() - INTERVAL '2 week'", m_Realm);
+
                 ExecuteNonQuery(cmd);
             }
 
@@ -451,7 +451,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsNoticesHandler(string connectionString, string realm) 
+        public PGSqlGroupsNoticesHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
@@ -461,8 +461,8 @@ namespace OpenSim.Data.PGSQL
 
             using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\" < CURRENT_DATE - INTERVAL '2 week'", m_Realm);
-                
+                cmd.CommandText = String.Format("delete from {0} where \"TMStamp\"::abstime::timestamp < now() - INTERVAL '2 week'", m_Realm);
+
                 ExecuteNonQuery(cmd);
             }
 
@@ -477,7 +477,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm) 
+        public PGSqlGroupsPrincipalsHandler(string connectionString, string realm)
             : base(connectionString, realm, string.Empty)
         {
         }
diff --git a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
index c999433..30fc5ea 100644
--- a/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Data.PGSQL
         {
             m_connectionString = connectionString;
             database = new PGSQLManager(connectionString);
-          
+
             //New migrations check of store
             database.CheckMigration(_migrationStore);
         }
@@ -190,8 +190,8 @@ namespace OpenSim.Data.PGSQL
             /*  NOTE: the implementation below is very inefficient (makes a separate request to get subfolders for
              * every found folder, recursively).  Inventory code for other DBs has been already rewritten to get ALL
              * inventory for a specific user at once.
-             * 
-             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never 
+             *
+             * Meanwhile, one little thing is corrected:  getFolderHierarchy(UUID.Zero) doesn't make sense and should never
              * be used, so check for that and return an empty list.
              */
 
@@ -264,11 +264,11 @@ namespace OpenSim.Data.PGSQL
         /// <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,
                                                        ""folderName"" = :folderName,
                                                        type = :type,
-                                                       version = :version 
+                                                       version = :version
                            WHERE folderID = :folderID";
 
             string folderName = folder.Name;
@@ -337,7 +337,7 @@ namespace OpenSim.Data.PGSQL
                 cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
                 conn.Open();
                 subFolders = getFolderHierarchy(folderID, cmd);
-                
+
 
                 //Delete all sub-folders
                 foreach (InventoryFolderBase f in subFolders)
@@ -403,7 +403,7 @@ namespace OpenSim.Data.PGSQL
                     }
                 }
             }
-            
+
             m_log.InfoFormat("[INVENTORY DB]: Found no inventory item with ID : {0}", itemID);
             return null;
         }
@@ -420,24 +420,24 @@ namespace OpenSim.Data.PGSQL
                 return;
             }
 
-            string sql = @"INSERT INTO inventoryitems 
-                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", 
+            string sql = @"INSERT INTO inventoryitems
+                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"",
                              ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"",
                              ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"",
-                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) 
+                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags)
                         VALUES
                             (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
                              :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
                              :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType,
                              :creationDate, :groupID, :groupOwned, :flags)";
-            
+
             string itemName = item.Name;
             if (item.Name.Length > 64)
             {
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
@@ -502,25 +502,25 @@ namespace OpenSim.Data.PGSQL
         /// <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,
                                                 ""parentFolderID"" = :parentFolderID,
                                                 ""avatarID"" = :avatarID,
-                                                ""inventoryName"" = :inventoryName, 
-                                                ""inventoryDescription"" = :inventoryDescription, 
-                                                ""inventoryNextPermissions"" = :inventoryNextPermissions, 
-                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, 
-                                                ""invType"" = :invType, 
-                                                ""creatorID"" = :creatorID, 
-                                                ""inventoryBasePermissions"" = :inventoryBasePermissions, 
-                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, 
-                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions, 
-                                                ""salePrice"" = :SalePrice, 
-                                                ""saleType"" = :SaleType, 
-                                                ""creationDate"" = :creationDate, 
-                                                ""groupID"" = :groupID, 
-                                                ""groupOwned"" = :groupOwned, 
-                                                flags = :flags 
+                                                ""inventoryName"" = :inventoryName,
+                                                ""inventoryDescription"" = :inventoryDescription,
+                                                ""inventoryNextPermissions"" = :inventoryNextPermissions,
+                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions,
+                                                ""invType"" = :invType,
+                                                ""creatorID"" = :creatorID,
+                                                ""inventoryBasePermissions"" = :inventoryBasePermissions,
+                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions,
+                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions,
+                                                ""salePrice"" = :SalePrice,
+                                                ""saleType"" = :SaleType,
+                                                ""creationDate"" = :creationDate,
+                                                ""groupID"" = :groupID,
+                                                ""groupOwned"" = :groupOwned,
+                                                flags = :flags
                                         WHERE ""inventoryID"" = :inventoryID";
 
             string itemName = item.Name;
@@ -529,7 +529,7 @@ namespace OpenSim.Data.PGSQL
                 itemName = item.Name.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length.ToString() + " to " + itemName.Length.ToString() + " characters on update");
             }
-            
+
             string itemDesc = item.Description;
             if (item.Description.Length > 128)
             {
diff --git a/OpenSim/Data/PGSQL/PGSQLManager.cs b/OpenSim/Data/PGSQL/PGSQLManager.cs
index 46f835a..276a37c 100644
--- a/OpenSim/Data/PGSQL/PGSQLManager.cs
+++ b/OpenSim/Data/PGSQL/PGSQLManager.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Data.PGSQL
             }
             if (PGFieldType == "double precision")
             {
-                return (Double)value;
+                return Convert.ToDouble(value);
             }
             return CreateParameterValue(value);
         }
@@ -326,7 +326,7 @@ namespace OpenSim.Data.PGSQL
         /// <param name="migrationStore">migrationStore.</param>
         public void CheckMigration(string migrationStore)
         {
-            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString)) 
+            using (NpgsqlConnection connection = new NpgsqlConnection(connectionString))
             {
                 connection.Open();
                 Assembly assem = GetType().Assembly;
diff --git a/OpenSim/Data/PGSQL/PGSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs
index 709fde0..749a3f2 100644
--- a/OpenSim/Data/PGSQL/PGSQLMigration.cs
+++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Data.PGSQL
             {
                 try
                 {
-                    cmd.CommandText = "select version from migrations where name = '" + type + "' " + 
-                                      " order by version desc limit 1"; //Must be 
+                    cmd.CommandText = "select version from migrations where name = '" + type + "' " +
+                                      " order by version desc limit 1"; //Must be
                     using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
                         if (reader.Read())
diff --git a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
index 82e5ed8..a0c3542 100644
--- a/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLOfflineIMData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.PGSQL
             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/PGSQL/PGSQLPresenceData.cs b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
index 0376585..ebbe8d3 100644..100755
--- a/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Data.PGSQL
             PresenceData[] pd = Get("SessionID", sessionID.ToString());
             if (pd.Length == 0)
                 return false;
-                
+
             if (regionID == UUID.Zero)
                 return false;
 
@@ -103,7 +103,7 @@ namespace OpenSim.Data.PGSQL
         public bool VerifyAgent(UUID agentId, UUID secureSessionID)
         {
             PresenceData[] ret = Get("SecureSessionID", secureSessionID.ToString());
-            
+
             if (ret.Length == 0)
                 return false;
 
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index b3076f0..1272e37 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -26,16 +26,14 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
-using System.IO;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Data;
 using RegionFlags = OpenSim.Framework.RegionFlags;
 using Npgsql;
 
@@ -59,7 +57,7 @@ namespace OpenSim.Data.PGSQL
             get { return GetType().Assembly; }
         }
 
-        public PGSQLRegionData(string connectionString, string realm) 
+        public PGSQLRegionData(string connectionString, string realm)
         {
             m_Realm = realm;
             m_ConnectionString = connectionString;
@@ -79,7 +77,7 @@ namespace OpenSim.Data.PGSQL
             m_FieldTypes = new Dictionary<string, string>();
 
             string query = string.Format(@"select column_name,data_type
-                        from INFORMATION_SCHEMA.COLUMNS 
+                        from INFORMATION_SCHEMA.COLUMNS
                        where table_name = lower('{0}');
 
                 ", m_Realm);
@@ -109,7 +107,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("regionName", regionName));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
                 return RunCommand(cmd);
@@ -118,24 +116,46 @@ namespace OpenSim.Data.PGSQL
 
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
-            string sql = "select * from "+m_Realm+" where \"locX\" = :posX and \"locY\" = :posY";
+            // extend database search for maximum region size area
+            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";
 
+            int startX = posX - (int)Constants.MaximumRegionSize;
+            int startY = posY - (int)Constants.MaximumRegionSize;
+            int endX = posX;
+            int endY = posY;
+
+            List<RegionData> ret;
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("posX", posX));
-                cmd.Parameters.Add(m_database.CreateParameter("posY", posY));
-                if (scopeID != UUID.Zero) 
+                cmd.Parameters.Add(m_database.CreateParameter("startX", startX));
+                cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
+                cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
-                List<RegionData> ret = RunCommand(cmd);
-                if (ret.Count == 0)
-                    return null;
+                ret = RunCommand(cmd);
+            }
 
-                return ret[0];
+            if (ret.Count == 0)
+                return null;
+
+            // Find the first that contains pos
+            RegionData rg = null;
+            foreach (RegionData r in ret)
+            {
+                if (posX >= r.posX && posX < r.posX + r.sizeX
+                    && posY >= r.posY && posY < r.posY + r.sizeY)
+                {
+                    rg = r;
+                    break;
+                }
             }
+
+            return rg;
         }
 
         public RegionData Get(UUID regionID, UUID scopeID)
@@ -147,7 +167,7 @@ namespace OpenSim.Data.PGSQL
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("regionID", regionID));
-                if (scopeID != UUID.Zero) 
+                if (scopeID != UUID.Zero)
                     cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
                 conn.Open();
                 List<RegionData> ret = RunCommand(cmd);
@@ -160,21 +180,41 @@ namespace OpenSim.Data.PGSQL
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
+            // extend database search for maximum region size area
             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";
 
+            int qstartX = startX - (int)Constants.MaximumRegionSize;
+            int qstartY = startY - (int)Constants.MaximumRegionSize;
+
+            List<RegionData> dbret;
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("startX", startX));
-                cmd.Parameters.Add(m_database.CreateParameter("startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("startX", qstartX));
+                cmd.Parameters.Add(m_database.CreateParameter("startY", qstartY));
                 cmd.Parameters.Add(m_database.CreateParameter("endX", endX));
                 cmd.Parameters.Add(m_database.CreateParameter("endY", endY));
-                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);
+
+                dbret = RunCommand(cmd);
             }
+
+            List<RegionData> ret = new List<RegionData>();
+
+            if(dbret.Count == 0)
+                return ret;
+
+            foreach (RegionData r in dbret)
+            {
+                if (r.posX + r.sizeX > startX && r.posX <= endX
+                    && r.posY + r.sizeY > startY && r.posY <= endY)
+                    ret.Add(r);
+            }
+            return ret;
         }
 
         public List<RegionData> RunCommand(NpgsqlCommand cmd)
@@ -258,7 +298,7 @@ namespace OpenSim.Data.PGSQL
             {
 
                 string update = "update " + m_Realm + " set \"locX\"=:posX, \"locY\"=:posY, \"sizeX\"=:sizeX, \"sizeY\"=:sizeY ";
-                
+
                 foreach (string field in fields)
                 {
 
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index 77d87d4..f4af40b 100644..100755
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -31,11 +31,13 @@ using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Data;
 using Npgsql;
 
 namespace OpenSim.Data.PGSQL
@@ -108,11 +110,11 @@ namespace OpenSim.Data.PGSQL
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
             SceneObjectGroup grp = null;
 
-            string sql = @"SELECT *, 
-                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort 
-                            FROM prims 
-                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID"" 
-                            WHERE ""RegionUUID"" = :RegionUUID 
+            string sql = @"SELECT *,
+                           CASE WHEN prims.""UUID"" = prims.""SceneGroupID"" THEN 0 ELSE 1 END as sort
+                            FROM prims
+                            LEFT JOIN primshapes ON prims.""UUID"" = primshapes.""UUID""
+                            WHERE ""RegionUUID"" = :RegionUUID
                             ORDER BY ""SceneGroupID"" asc, sort asc, ""LinkNumber"" asc";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -144,7 +146,7 @@ namespace OpenSim.Data.PGSQL
                             // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
                             // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
                             // this case, force the UUID to be the same as the group UUID so that at least these can be
-                            // deleted (we need to change the UUID so that any other prims in the linkset can also be 
+                            // deleted (we need to change the UUID so that any other prims in the linkset can also be
                             // deleted).
                             if (sceneObjectPart.UUID != groupID && groupID != UUID.Zero)
                             {
@@ -176,7 +178,7 @@ namespace OpenSim.Data.PGSQL
                 objects[grp.UUID] = grp;
 
             // Instead of attempting to LoadItems on every prim,
-            // most of which probably have no items... get a 
+            // most of which probably have no items... get a
             // list from DB of all prims which have items and
             // LoadItems only on those
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
@@ -329,54 +331,55 @@ namespace OpenSim.Data.PGSQL
         private void StoreSceneObjectPrim(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
         {
             //Big query to update or insert a new prim.
-            
+
             string queryPrims = @"
-        UPDATE prims SET 
-            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName, 
-            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask, 
-            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ, 
-            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX, 
-            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY, 
-            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY, 
-            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW, 
-            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ, 
-            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY, 
-            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID, 
-            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2, 
-            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain, 
-            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX, 
-            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX, 
-            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook, 
-            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice, 
-            ""SaleType"" = :SaleType, ""ColorR"" = :ColorR, ""ColorG"" = :ColorG, ""ColorB"" = :ColorB, ""ColorA"" = :ColorA, ""ParticleSystem"" = :ParticleSystem, 
+        UPDATE prims SET
+            ""CreationDate"" = :CreationDate, ""Name"" = :Name, ""Text"" = :Text, ""Description"" = :Description, ""SitName"" = :SitName,
+            ""TouchName"" = :TouchName, ""ObjectFlags"" = :ObjectFlags, ""OwnerMask"" = :OwnerMask, ""NextOwnerMask"" = :NextOwnerMask, ""GroupMask"" = :GroupMask,
+            ""EveryoneMask"" = :EveryoneMask, ""BaseMask"" = :BaseMask, ""PositionX"" = :PositionX, ""PositionY"" = :PositionY, ""PositionZ"" = :PositionZ,
+            ""GroupPositionX"" = :GroupPositionX, ""GroupPositionY"" = :GroupPositionY, ""GroupPositionZ"" = :GroupPositionZ, ""VelocityX"" = :VelocityX,
+            ""VelocityY"" = :VelocityY, ""VelocityZ"" = :VelocityZ, ""AngularVelocityX"" = :AngularVelocityX, ""AngularVelocityY"" = :AngularVelocityY,
+            ""AngularVelocityZ"" = :AngularVelocityZ, ""AccelerationX"" = :AccelerationX, ""AccelerationY"" = :AccelerationY,
+            ""AccelerationZ"" = :AccelerationZ, ""RotationX"" = :RotationX, ""RotationY"" = :RotationY, ""RotationZ"" = :RotationZ, ""RotationW"" = :RotationW,
+            ""SitTargetOffsetX"" = :SitTargetOffsetX, ""SitTargetOffsetY"" = :SitTargetOffsetY, ""SitTargetOffsetZ"" = :SitTargetOffsetZ,
+            ""SitTargetOrientW"" = :SitTargetOrientW, ""SitTargetOrientX"" = :SitTargetOrientX, ""SitTargetOrientY"" = :SitTargetOrientY,
+            ""SitTargetOrientZ"" = :SitTargetOrientZ, ""RegionUUID"" = :RegionUUID, ""CreatorID"" = :CreatorID, ""OwnerID"" = :OwnerID, ""GroupID"" = :GroupID,
+            ""LastOwnerID"" = :LastOwnerID, ""SceneGroupID"" = :SceneGroupID, ""PayPrice"" = :PayPrice, ""PayButton1"" = :PayButton1, ""PayButton2"" = :PayButton2,
+            ""PayButton3"" = :PayButton3, ""PayButton4"" = :PayButton4, ""LoopedSound"" = :LoopedSound, ""LoopedSoundGain"" = :LoopedSoundGain,
+            ""TextureAnimation"" = :TextureAnimation, ""OmegaX"" = :OmegaX, ""OmegaY"" = :OmegaY, ""OmegaZ"" = :OmegaZ, ""CameraEyeOffsetX"" = :CameraEyeOffsetX,
+            ""CameraEyeOffsetY"" = :CameraEyeOffsetY, ""CameraEyeOffsetZ"" = :CameraEyeOffsetZ, ""CameraAtOffsetX"" = :CameraAtOffsetX,
+            ""CameraAtOffsetY"" = :CameraAtOffsetY, ""CameraAtOffsetZ"" = :CameraAtOffsetZ, ""ForceMouselook"" = :ForceMouselook,
+            ""ScriptAccessPin"" = :ScriptAccessPin, ""AllowedDrop"" = :AllowedDrop, ""DieAtEdge"" = :DieAtEdge, ""SalePrice"" = :SalePrice,
+            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution, 
+            ""PassCollisions"" = :PassCollisions, ""RotationAxisLocks"" = :RotationAxisLocks, ""RezzerID"" = :RezzerID,
             ""ClickAction"" = :ClickAction, ""Material"" = :Material, ""CollisionSound"" = :CollisionSound, ""CollisionSoundVolume"" = :CollisionSoundVolume, ""PassTouches"" = :PassTouches,
             ""LinkNumber"" = :LinkNumber, ""MediaURL"" = :MediaURL, ""DynAttrs"" = :DynAttrs,
-            ""PhysicsShapeType"" = :PhysicsShapeType, ""Density"" = :Density, ""GravityModifier"" = :GravityModifier, ""Friction"" = :Friction, ""Restitution"" = :Restitution
+            ""PhysInertia"" = :PhysInertia
         WHERE ""UUID"" = :UUID ;
 
-        INSERT INTO 
+        INSERT INTO
             prims (
             ""UUID"", ""CreationDate"", ""Name"", ""Text"", ""Description"", ""SitName"", ""TouchName"", ""ObjectFlags"", ""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"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"", 
-            ""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"", 
+            ""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"", ""RegionUUID"", ""CreatorID"", ""OwnerID"", ""GroupID"", ""LastOwnerID"", ""SceneGroupID"",
+            ""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"", ""PassTouches"", ""LinkNumber"", ""MediaURL"", ""DynAttrs"",
-            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution""
-            ) Select 
-            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :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, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID, 
-            :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, 
+            ""PhysicsShapeType"", ""Density"", ""GravityModifier"", ""Friction"", ""Restitution"", ""PassCollisions"", ""RotationAxisLocks"", ""RezzerID"" , ""PhysInertia""
+            ) Select
+            :UUID, :CreationDate, :Name, :Text, :Description, :SitName, :TouchName, :ObjectFlags, :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, :RegionUUID, :CreatorID, :OwnerID, :GroupID, :LastOwnerID, :SceneGroupID,
+            :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, :PassTouches, :LinkNumber, :MediaURL, :DynAttrs,
-            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution
+            :PhysicsShapeType, :Density, :GravityModifier, :Friction, :Restitution, :PassCollisions, :RotationAxisLocks, :RezzerID, :PhysInertia
             where not EXISTS (SELECT ""UUID"" FROM prims WHERE ""UUID"" = :UUID);
         ";
 
@@ -399,26 +402,26 @@ namespace OpenSim.Data.PGSQL
         private void StoreSceneObjectPrimShapes(SceneObjectPart sceneObjectPart, NpgsqlCommand sqlCommand, UUID sceneGroupID, UUID regionUUID)
         {
             //Big query to or insert or update primshapes
-            
+
             string queryPrimShapes = @"
-        UPDATE primshapes SET 
-            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin, 
-            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY, 
-            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions, 
-            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin, 
-            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow, 
+        UPDATE primshapes SET
+            ""Shape"" = :Shape, ""ScaleX"" = :ScaleX, ""ScaleY"" = :ScaleY, ""ScaleZ"" = :ScaleZ, ""PCode"" = :PCode, ""PathBegin"" = :PathBegin,
+            ""PathEnd"" = :PathEnd, ""PathScaleX"" = :PathScaleX, ""PathScaleY"" = :PathScaleY, ""PathShearX"" = :PathShearX, ""PathShearY"" = :PathShearY,
+            ""PathSkew"" = :PathSkew, ""PathCurve"" = :PathCurve, ""PathRadiusOffset"" = :PathRadiusOffset, ""PathRevolutions"" = :PathRevolutions,
+            ""PathTaperX"" = :PathTaperX, ""PathTaperY"" = :PathTaperY, ""PathTwist"" = :PathTwist, ""PathTwistBegin"" = :PathTwistBegin,
+            ""ProfileBegin"" = :ProfileBegin, ""ProfileEnd"" = :ProfileEnd, ""ProfileCurve"" = :ProfileCurve, ""ProfileHollow"" = :ProfileHollow,
             ""Texture"" = :Texture, ""ExtraParams"" = :ExtraParams, ""State"" = :State, ""Media"" = :Media
         WHERE ""UUID"" = :UUID ;
 
-        INSERT INTO 
+        INSERT INTO
             primshapes (
-            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"", 
-            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"", 
+            ""UUID"", ""Shape"", ""ScaleX"", ""ScaleY"", ""ScaleZ"", ""PCode"", ""PathBegin"", ""PathEnd"", ""PathScaleX"", ""PathScaleY"", ""PathShearX"", ""PathShearY"",
+            ""PathSkew"", ""PathCurve"", ""PathRadiusOffset"", ""PathRevolutions"", ""PathTaperX"", ""PathTaperY"", ""PathTwist"", ""PathTwistBegin"", ""ProfileBegin"",
             ""ProfileEnd"", ""ProfileCurve"", ""ProfileHollow"", ""Texture"", ""ExtraParams"", ""State"", ""Media""
-            ) 
+            )
             Select
-            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY, 
-            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin, 
+            :UUID, :Shape, :ScaleX, :ScaleY, :ScaleZ, :PCode, :PathBegin, :PathEnd, :PathScaleX, :PathScaleY, :PathShearX, :PathShearY,
+            :PathSkew, :PathCurve, :PathRadiusOffset, :PathRevolutions, :PathTaperX, :PathTaperY, :PathTwist, :PathTwistBegin, :ProfileBegin,
             :ProfileEnd, :ProfileCurve, :ProfileHollow, :Texture, :ExtraParams, :State, :Media
         where not EXISTS (SELECT ""UUID"" FROM primshapes WHERE ""UUID"" = :UUID);
         ";
@@ -498,7 +501,7 @@ namespace OpenSim.Data.PGSQL
             sql =
                 @"INSERT INTO primitems (
             ""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,
             :lastOwnerID,:groupID,:nextPermissions,:currentPermissions,:basePermissions,:everyonePermissions,:groupPermissions,:flags)";
 
@@ -536,7 +539,7 @@ namespace OpenSim.Data.PGSQL
         {
             TerrainData terrData = null;
 
-            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain 
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from terrain
                             where ""RegionUUID"" = :RegionUUID order by ""Revision"" desc limit 1; ";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -552,8 +555,11 @@ namespace OpenSim.Data.PGSQL
                         if (reader.Read())
                         {
                             rev = Convert.ToInt32(reader["Revision"]);
-                            byte[] blob = (byte[])reader["Heightfield"];
-                            terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                            if ((reader["Heightfield"] != DBNull.Value))
+                            {
+                                byte[] blob = (byte[])reader["Heightfield"];
+                                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                            }
                         }
                         else
                         {
@@ -568,6 +574,39 @@ namespace OpenSim.Data.PGSQL
             return terrData;
         }
 
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            TerrainData terrData = null;
+
+            string sql = @"select ""RegionUUID"", ""Revision"", ""Heightfield"" from bakedterrain
+                            where ""RegionUUID"" = :RegionUUID; ";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    // PGSqlParameter param = new PGSqlParameter();
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    conn.Open();
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        int rev;
+                        if (reader.Read())
+                        {
+                            rev = Convert.ToInt32(reader["Revision"]);
+                            if ((reader["Heightfield"] != DBNull.Value))
+                            {
+                                byte[] blob = (byte[])reader["Heightfield"];
+                                terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return terrData;
+        }
+
         // Legacy entry point for when terrain was always a 256x256 heightmap
         public void StoreTerrain(double[,] terrain, UUID regionID)
         {
@@ -619,6 +658,49 @@ namespace OpenSim.Data.PGSQL
         }
 
         /// <summary>
+        /// Stores the baked terrain map to DB.
+        /// </summary>
+        /// <param name="terrain">terrain map data.</param>
+        /// <param name="regionID">regionID.</param>
+        public void StoreBakedTerrain(TerrainData terrData, UUID regionID)
+        {
+            //Delete old terrain map
+            string sql = @"delete from bakedterrain where ""RegionUUID""=:RegionUUID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+
+                    _Log.InfoFormat("{0} Deleted bakedterrain id = {1}", LogHeader, regionID);
+                }
+            }
+
+            int terrainDBRevision;
+            Array terrainDBblob;
+            terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+
+            sql = @"insert into bakedterrain(""RegionUUID"", ""Revision"", ""Heightfield"") values(:RegionUUID, :Revision, :Heightfield)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            {
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
+                {
+                    cmd.Parameters.Add(_Database.CreateParameter("RegionUUID", regionID));
+                    cmd.Parameters.Add(_Database.CreateParameter("Revision", terrainDBRevision));
+                    cmd.Parameters.Add(_Database.CreateParameter("Heightfield", terrainDBblob));
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
+
+                    _Log.InfoFormat("{0} Stored bakedterrain id = {1}, terrainSize = <{2},{3}>",
+                                    LogHeader, regionID, terrData.SizeX, terrData.SizeY);
+                }
+            }
+        }
+
+        /// <summary>
         /// Loads all the land objects of a region.
         /// </summary>
         /// <param name="regionUUID">The region UUID.</param>
@@ -683,11 +765,14 @@ namespace OpenSim.Data.PGSQL
             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"")
+                 ""SnapshotUUID"",""UserLocationX"",""UserLocationY"",""UserLocationZ"",""UserLookAtX"",""UserLookAtY"",""UserLookAtZ"",""AuthbuyerID"",""OtherCleanTime"",""Dwell"",
+                 ""MediaType"",""MediaDescription"",""MediaSize"",""MediaLoop"",""ObscureMusic"",""ObscureMedia"",""SeeAVs"",""AnyAVSounds"",""GroupAVSounds"")
                 VALUES
                 (: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,:Dwell,
+                 :MediaType,:MediaDescription,:MediaWidth::text || ',' || :MediaHeight::text,:MediaLoop,:ObscureMusic,:ObscureMedia,:SeeAVs::int::smallint,
+                 :AnyAVSounds::int::smallint,:GroupAVSounds::int::smallint)";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
@@ -1235,7 +1320,7 @@ namespace OpenSim.Data.PGSQL
         {
             {
                 string sql = "DELETE FROM regionenvironment WHERE region_id = :region_id ;";
-                
+
                 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
                 using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
@@ -1336,17 +1421,17 @@ namespace OpenSim.Data.PGSQL
             {
                 //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 
-,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 
-,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_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_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 
-,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, 
+                   @"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
+,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
+,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
+,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
+,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
  WHERE ""regionUUID"" = :regionUUID";
 
@@ -1381,13 +1466,13 @@ namespace OpenSim.Data.PGSQL
                                 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
-                                ) 
+                                )
                             VALUES
                                 (: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, :covenant_datetime, :sunvectorx,:sunvectory, 
+                                :terrain_lower_limit,:use_estate_sun,:fixed_sun,:sun_position,:covenant, :covenant_datetime, :sunvectorx,:sunvectory,
                                 :sunvectorz, :Sandbox, :loaded_creation_datetime, :loaded_creation_id )";
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
@@ -1515,6 +1600,8 @@ namespace OpenSim.Data.PGSQL
             newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]);
 
             newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
+            newData.Dwell = Convert.ToSingle(row["Dwell"]);
+
 
             try
             {
@@ -1541,6 +1628,10 @@ namespace OpenSim.Data.PGSQL
             newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
             newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
 
+            newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]);
+            newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]);
+            newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]);
+
             return newData;
         }
 
@@ -1588,6 +1679,12 @@ namespace OpenSim.Data.PGSQL
             prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
             prim.GroupID = new UUID((Guid)primRow["GroupID"]);
             prim.LastOwnerID = new UUID((Guid)primRow["LastOwnerID"]);
+            
+            if (primRow["RezzerID"] != DBNull.Value)
+                prim.RezzerID = new UUID((Guid)primRow["RezzerID"]);
+            else
+                prim.RezzerID = UUID.Zero;
+                
             prim.OwnerMask = Convert.ToUInt32(primRow["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(primRow["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(primRow["GroupMask"]);
@@ -1692,6 +1789,7 @@ namespace OpenSim.Data.PGSQL
             prim.CollisionSoundVolume = Convert.ToSingle(primRow["CollisionSoundVolume"]);
 
             prim.PassTouches = (bool)primRow["PassTouches"];
+            prim.PassCollisions = (bool)primRow["PassCollisions"];
 
             if (!(primRow["MediaURL"] is System.DBNull))
                 prim.MediaUrl = (string)primRow["MediaURL"];
@@ -1699,13 +1797,20 @@ namespace OpenSim.Data.PGSQL
             if (!(primRow["DynAttrs"] is System.DBNull) && (string)primRow["DynAttrs"] != "")
                 prim.DynAttrs = DAMap.FromXml((string)primRow["DynAttrs"]);
             else
-                prim.DynAttrs = new DAMap();             
+                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"]);
+            prim.RotationAxisLocks = Convert.ToByte(primRow["RotationAxisLocks"]);
+            
+            
+            PhysicsInertiaData pdata = null;
+            if (!(primRow["PhysInertia"] is System.DBNull))
+                pdata = PhysicsInertiaData.FromXml2(primRow["PhysInertia"].ToString());
+            prim.PhysicsInertia = pdata;
 
             return prim;
         }
@@ -1942,6 +2047,17 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("UserLookAtZ", land.UserLookAt.Z));
             parameters.Add(_Database.CreateParameter("AuthBuyerID", land.AuthBuyerID));
             parameters.Add(_Database.CreateParameter("OtherCleanTime", land.OtherCleanTime));
+            parameters.Add(_Database.CreateParameter("Dwell", land.Dwell));
+            parameters.Add(_Database.CreateParameter("MediaDescription", land.MediaDescription));
+            parameters.Add(_Database.CreateParameter("MediaType", land.MediaType));
+            parameters.Add(_Database.CreateParameter("MediaWidth", land.MediaWidth));
+            parameters.Add(_Database.CreateParameter("MediaHeight", land.MediaHeight));
+            parameters.Add(_Database.CreateParameter("MediaLoop", land.MediaLoop));
+            parameters.Add(_Database.CreateParameter("ObscureMusic", land.ObscureMusic));
+            parameters.Add(_Database.CreateParameter("ObscureMedia", land.ObscureMedia));
+            parameters.Add(_Database.CreateParameter("SeeAVs", land.SeeAVs));
+            parameters.Add(_Database.CreateParameter("AnyAVSounds", land.AnyAVSounds));
+            parameters.Add(_Database.CreateParameter("GroupAVSounds", land.GroupAVSounds));
 
             return parameters.ToArray();
         }
@@ -1996,6 +2112,7 @@ namespace OpenSim.Data.PGSQL
             parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
             parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));
             parameters.Add(_Database.CreateParameter("LastOwnerID", prim.LastOwnerID));
+            parameters.Add(_Database.CreateParameter("RezzerID", prim.RezzerID));
             parameters.Add(_Database.CreateParameter("OwnerMask", prim.OwnerMask));
             parameters.Add(_Database.CreateParameter("NextOwnerMask", prim.NextOwnerMask));
             parameters.Add(_Database.CreateParameter("GroupMask", prim.GroupMask));
@@ -2094,28 +2211,47 @@ namespace OpenSim.Data.PGSQL
 
             parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
             parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
+
+            parameters.Add(_Database.CreateParameter("PassTouches", (bool)prim.PassTouches));
+            parameters.Add(_Database.CreateParameter("PassCollisions", (bool)prim.PassCollisions));
+            
             
-            parameters.Add(_Database.CreateParameter("PassTouches", prim.PassTouches));
+            if (prim.PassTouches)
+                parameters.Add(_Database.CreateParameter("PassTouches", true));
+            else
+                parameters.Add(_Database.CreateParameter("PassTouches", false));
+
+            if (prim.PassCollisions)
+                parameters.Add(_Database.CreateParameter("PassCollisions", true));
+            else
+                parameters.Add(_Database.CreateParameter("PassCollisions", false));
 
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
             
+            if (prim.PhysicsInertia != null)
+                parameters.Add(_Database.CreateParameter("PhysInertia", prim.PhysicsInertia.ToXml2()));
+            else
+                parameters.Add(_Database.CreateParameter("PhysInertia", String.Empty));
+
+
             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));
+            parameters.Add(_Database.CreateParameter("RotationAxisLocks", prim.RotationAxisLocks));
 
             return parameters.ToArray();
         }
 
         /// <summary>
-        /// Creates the primshape parameters for stroing in DB.
+        /// Creates the primshape parameters for storing in DB.
         /// </summary>
         /// <param name="prim">Basic data of SceneObjectpart prim.</param>
         /// <param name="sceneGroupID">The scene group ID.</param>
@@ -2227,6 +2363,11 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
index 0a68b23..64cfff0 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserAccountData.cs
@@ -42,13 +42,13 @@ namespace OpenSim.Data.PGSQL
     {
         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;
@@ -122,7 +122,7 @@ namespace OpenSim.Data.PGSQL
             {
                 cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
                 cmd.Parameters.Add(m_database.CreateParameter("scopeID", scopeID));
-                
+
                 conn.Open();
                 using (NpgsqlDataReader result = cmd.ExecuteReader())
                 {
@@ -158,8 +158,8 @@ namespace OpenSim.Data.PGSQL
             }
             return null;
         }
-        
-        
+
+
         public override bool Store(UserAccountData data)
         {
             if (data.Data.ContainsKey("PrincipalID"))
@@ -214,7 +214,7 @@ namespace OpenSim.Data.PGSQL
                 catch (Exception e){
                     m_log.ErrorFormat("[USER]: ERROR opened update user {0} ", e.Message);
                 }
-                
+
 
                 if (conta < 1)
                 {
@@ -242,14 +242,14 @@ namespace OpenSim.Data.PGSQL
             }
             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);
@@ -299,7 +299,7 @@ namespace OpenSim.Data.PGSQL
 
             string sql = "";
             UUID scope_id;
-            UUID.TryParse(scopeID.ToString(), out scope_id); 
+            UUID.TryParse(scopeID.ToString(), out scope_id);
 
             using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             using (NpgsqlCommand cmd = new NpgsqlCommand())
@@ -325,5 +325,10 @@ namespace OpenSim.Data.PGSQL
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index f166976..75a51e2 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -412,15 +412,15 @@ namespace OpenSim.Data.PGSQL
             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 * ) 
+                            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) 
+                            snapshotuuid,""user"",originalname,simname,posglobal,sortorder,enabled)
                       SELECT
                             :PickId,:CreatorId,:TopPick,:ParcelId,:Name,:Desc,:SnapshotId,:User,
-                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled 
+                            :Original,:SimName,:GlobalPos,:SortOrder,:Enabled
                       WHERE NOT EXISTS (
                         SELECT * FROM upsert )";
 
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
index 4f682f0..1798d20 100644
--- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Data.PGSQL
 
                     using (NpgsqlCommand cmd = new NpgsqlCommand(
                         @"SELECT name, description, access_time, ""AssetType"", local, temporary, asset_flags, creatorid, data
-                            FROM XAssetsMeta 
+                            FROM XAssetsMeta
                             JOIN XAssetsData ON XAssetsMeta.hash = XAssetsData.Hash WHERE id=:ID",
                         dbcon))
                     {
@@ -173,16 +173,18 @@ namespace OpenSim.Data.PGSQL
 
                                     if (m_enableCompression)
                                     {
-                                        using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress))
+                                        using(MemoryStream ms = new MemoryStream(asset.Data))
+                                        using(GZipStream decompressionStream = new GZipStream(ms, 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);
+                                            using(MemoryStream outputStream = new MemoryStream())
+                                            {
+                                                decompressionStream.CopyTo(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);
                                         }
                                     }
 
@@ -223,16 +225,16 @@ namespace OpenSim.Data.PGSQL
                         {
                             assetName = asset.Name.Substring(0, 64);
                             m_log.WarnFormat(
-                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                "[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", 
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                                 asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                         }
 
@@ -268,8 +270,8 @@ namespace OpenSim.Data.PGSQL
                                         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, 
+                                          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;
                                      ",
@@ -321,13 +323,13 @@ namespace OpenSim.Data.PGSQL
                             {
                                 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();
                     }
                 }
@@ -374,7 +376,7 @@ namespace OpenSim.Data.PGSQL
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
-                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}", 
+                            "[XASSET PGSQL DB]: Failure updating access_time for asset {0} with name {1} : {2}",
                             assetMetadata.ID, assetMetadata.Name, e.Message);
                     }
                 }
@@ -518,40 +520,42 @@ namespace OpenSim.Data.PGSQL
                 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(NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
+                                            FROM XAssetsMeta
+                                            LIMIT :start, :count",dbcon))
                     {
-                        using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
+                        cmd.Parameters.Add(m_database.CreateParameter("start",start));
+                        cmd.Parameters.Add(m_database.CreateParameter("count", count));
+
+                        try
                         {
-                            while (dbReader.Read())
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
                             {
-                                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();
+                                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"]);
+                                    // We'll ignore this for now - it appears unused!
+    //                                metadata.SHA1 = dbReader["hash"]);
 
-                                UpdateAccessTime(metadata, (int)dbReader["access_time"]);
+                                    UpdateAccessTime(metadata, (int)dbReader["access_time"]);
 
-                                retList.Add(metadata);
+                                    retList.Add(metadata);
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
+                        catch (Exception e)
+                        {
+                            m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
+                        }
+                   }
                 }
             }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index a22b882..4c10ac9 100644
--- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -174,7 +174,9 @@ namespace OpenSim.Data.PGSQL
             {
                 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);
+
+                    cmd.CommandText = String.Format(@"select * from inventoryitems where ""avatarID"" = :uuid and ""assetType"" = :type and ""flags"" = 1");
 
                     UUID princID = UUID.Zero;
                     UUID.TryParse(principalID, out princID);
@@ -194,11 +196,18 @@ namespace OpenSim.Data.PGSQL
             {
                 using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
-                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
-                                 from inventoryitems 
-                                 where ""avatarID"" = :PrincipalID 
-                                   and ""assetID"" = :AssetID 
+/*
+                    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""
+                                 from inventoryitems
+                                 where ""avatarID""::uuid = :PrincipalID
+                                   and ""assetID""::uuid = :AssetID
+                                 group by ""assetID"" ");
 
                     cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
                     cmd.Parameters.Add(m_database.CreateParameter("AssetID", assetID));
diff --git a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
index 1e88b2c..ad7ffb8 100644
--- a/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/PGSQL/Properties/AssemblyInfo.cs
@@ -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.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
diff --git a/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations b/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations
new file mode 100644
index 0000000..ca3cca2
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/AgentPrefs.migrations
@@ -0,0 +1,19 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS "public"."agentprefs" (
+        "PrincipalID" uuid NOT NULL,
+        "AccessPrefs" char(2) NOT NULL DEFAULT 'M'::bpchar COLLATE "default",
+        "HoverHeight" float8 NOT NULL DEFAULT 0,
+        "Language" char(5) NOT NULL DEFAULT 'en-us'::bpchar COLLATE "default",
+        "LanguageIsPublic" bool NOT NULL DEFAULT true,
+        "PermEveryone" int4 NOT NULL DEFAULT 0,
+        "PermGroup" int4 NOT NULL DEFAULT 0,
+        "PermNextOwner" int4 NOT NULL DEFAULT 532480
+)
+WITH (OIDS=FALSE);
+
+ALTER TABLE "public"."agentprefs" ADD PRIMARY KEY ("PrincipalID") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/AuthStore.migrations b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
index a1f5b61..043a8f7 100644
--- a/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AuthStore.migrations
@@ -30,3 +30,11 @@ BEGIN TRANSACTION;
 
 COMMIT;
 
+:VERSION 3
+
+BEGIN TRANSACTION;
+
+CREATE UNIQUE INDEX auth_pkey ON auth USING btree (uuid);
+ALTER TABLE tokens ADD CONSTRAINT "uuid_token" UNIQUE ("uuid","token") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
index 59270f8..5b450aa 100644
--- a/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/EstateStore.migrations
@@ -1,307 +1,127 @@
-:VERSION 1
+:VERSION 12
 
 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,
+-- ----------------------------
+--  Table structure for estate_groups
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estate_groups" (
+        "EstateID" int4 NOT NULL,
+        "uuid" uuid NOT NULL
+)
+WITH (OIDS=FALSE);
+
+--  Indexes structure for table estate_groups
+-- ----------------------------
+CREATE INDEX IF NOT EXISTS "ix_estate_groups" ON "public"."estate_groups" USING btree("EstateID" "pg_catalog"."int4_ops" ASC NULLS LAST);
+
+-- ----------------------------
+--  Table structure for estate_managers
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estate_managers" (
+        "EstateID" int4 NOT NULL,
+        "uuid" uuid NOT NULL
+)
+WITH (OIDS=FALSE);
+
+--  Indexes structure for table estate_managers
+-- ----------------------------
+CREATE INDEX IF NOT EXISTS "ix_estate_managers" ON "public"."estate_managers" USING btree("EstateID" "pg_catalog"."int4_ops" ASC NULLS LAST);
+
+-- ----------------------------
+--  Table structure for estate_map
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estate_map" (
+        "RegionID" uuid NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'::uuid,
+        "EstateID" int4 NOT NULL
+)
+WITH (OIDS=FALSE);
+
+--  Primary key structure for table estate_map
+-- ----------------------------
+ALTER TABLE "public"."estate_map" ADD PRIMARY KEY ("RegionID") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+-- ----------------------------
+--  Table structure for estate_settings
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estate_settings" (
+        "EstateID" int4 NOT NULL DEFAULT nextval('estate_settings_id'::regclass),
+        "EstateName" varchar(64) DEFAULT NULL::character varying COLLATE "default",
+        "AbuseEmailToEstateOwner" bool NOT NULL,
+        "DenyAnonymous" bool NOT NULL,
+        "ResetHomeOnTeleport" bool NOT NULL,
+        "FixedSun" bool NOT NULL,
+        "DenyTransacted" bool NOT NULL,
+        "BlockDwell" bool NOT NULL,
+        "DenyIdentified" bool NOT NULL,
+        "AllowVoice" bool NOT NULL,
+        "UseGlobalTime" bool NOT NULL,
+        "PricePerMeter" int4 NOT NULL,
+        "TaxFree" bool NOT NULL,
+        "AllowDirectTeleport" bool NOT NULL,
+        "RedirectGridX" int4 NOT NULL,
+        "RedirectGridY" int4 NOT NULL,
+        "ParentEstateID" int4 NOT NULL,
+        "SunPosition" float8 NOT NULL,
+        "EstateSkipScripts" bool NOT NULL,
+        "BillableFactor" float8 NOT NULL,
+        "PublicAccess" bool NOT NULL,
+        "AbuseEmail" varchar(255) NOT NULL COLLATE "default",
         "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;
-
+        "DenyMinors" bool NOT NULL,
+        "AllowLandmark" bool NOT NULL DEFAULT true,
+        "AllowParcelChanges" bool NOT NULL DEFAULT true,
+        "AllowSetHome" bool NOT NULL DEFAULT true
+)
+WITH (OIDS=FALSE);
+
+--  Primary key structure for table estate_settings
+-- ----------------------------
+ALTER TABLE "public"."estate_settings" ADD PRIMARY KEY ("EstateID") NOT DEFERRABLE INITIALLY IMMEDIATE;
+
+-- ----------------------------
+--  Table structure for estate_users
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estate_users" (
+        "EstateID" int4 NOT NULL,
+        "uuid" uuid NOT NULL
+)
+WITH (OIDS=FALSE);
+
+--  Indexes structure for table estate_users
+-- ----------------------------
+CREATE INDEX  IF NOT EXISTS "ix_estate_users" ON "public"."estate_users" USING btree("EstateID" "pg_catalog"."int4_ops" ASC NULLS LAST);
+
+-- ----------------------------
+--  Table structure for estateban
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "public"."estateban" (
+        "EstateID" int4 NOT NULL,
+        "bannedUUID" uuid NOT NULL,
+        "bannedIp" varchar(16) COLLATE "default",
+        "bannedIpHostMask" varchar(16) COLLATE "default",
+        "bannedNameMask" varchar(64) COLLATE "default"
+)
+WITH (OIDS=FALSE);
 
-Create index on estate_settings (lower("EstateName"));
+--  Indexes structure for table estateban
+-- ----------------------------
+CREATE INDEX IF NOT EXISTS  "ix_estateban" ON "public"."estateban" USING btree("EstateID" "pg_catalog"."int4_ops" ASC NULLS LAST);
 
 COMMIT;
 
+:VERSION 13
 
-: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;
+ BEGIN TRASACTION;
 
-:VERSION 10
+-- ----------------------------
+-- SEQUENCE estate_settings_id
+-- ----------------------------
+CREATE SEQUENCE IF NOT EXISTS "public"."estate_settings_id"
+  INCREMENT 100
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 100
+  CACHE 1;
 
-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/FSAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/FSAssetStore.migrations
new file mode 100644
index 0000000..3a072e5
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/FSAssetStore.migrations
@@ -0,0 +1,14 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE fsassets (
+  "id" uuid NOT NULL PRIMARY KEY,
+  "type" integer NOT NULL,
+  "hash" char(64) NOT NULL,
+  "create_time" integer NOT NULL DEFAULT '0',
+  "access_time" integer NOT NULL DEFAULT '0',
+  "asset_flags" integer NOT NULL DEFAULT '0'
+);
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/Presence.migrations b/OpenSim/Data/PGSQL/Resources/Presence.migrations
index 5184034..5184034 100644..100755
--- a/OpenSim/Data/PGSQL/Resources/Presence.migrations
+++ b/OpenSim/Data/PGSQL/Resources/Presence.migrations
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
index 1284ce0..fcefb6b 100644
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -1153,10 +1153,75 @@ ALTER TABLE regionwindlight ALTER COLUMN draw_classic_clouds SET DEFAULT FALSE;
 
 COMMIT;
 
-VERSION 41       #-- Change Landlags to bigint
+:VERSION 41       #-- Change Landlags to bigint
 
 BEGIN TRANSACTION;
 
 ALTER TABLE land ALTER "LandFlags" TYPE bigint;
 
 COMMIT;
+
+:VERSION 42      #-- avination fields
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "PassCollisions" smallint NOT NULL DEFAULT (0);
+ALTER TABLE prims ADD "Vehicle" text COLLATE "default";
+ALTER TABLE regionsettings ADD "block_search" smallint NOT NULL DEFAULT (0);
+ALTER TABLE regionsettings ADD  "casino" smallint NOT NULL DEFAULT (0);
+ALTER TABLE land ADD "SeeAVs" smallint NOT NULL DEFAULT (1);
+ALTER TABLE land ADD "AnyAVSounds" smallint NOT NULL DEFAULT (1);
+ALTER TABLE land ADD "GroupAVSounds" smallint NOT NULL DEFAULT (1);
+
+COMMIT;
+
+:VERSION 43     #---- STATUS ROTATION axis locks
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "RotationAxisLocks" smallint NOT NULL DEFAULT (0);
+
+COMMIT;
+
+:VERSION 44     #---- add baked terrain store
+
+BEGIN TRANSACTION;
+
+CREATE TABLE bakedterrain
+        (
+        "RegionUUID" uuid NULL,
+        "Revision" int NULL,
+        "Heightfield" bytea NULL
+        );
+
+COMMIT;
+
+:VERSION 45 #---- Add RezzerID filed in table prims
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "RezzerID" uuid NULL;
+
+COMMIT;
+
+:VERSION 46 #---- Add physics inertia data to table prims
+
+BEGIN TRANSACTION;
+
+ALTER TABLE prims ADD "PhysInertia" TEXT;
+
+COMMIT;
+
+
+:VERSION 47 #---- Convert field PassCollisions in table prims to BOOLEAN
+
+BEGIN TRANSACTION;
+
+ALTER TABLE "public"."prims" ALTER COLUMN "PassCollisions" DROP DEFAULT;
+ALTER TABLE "public"."prims"
+    ALTER COLUMN "PassCollisions" TYPE BOOLEAN
+        USING CASE WHEN "PassCollisions" = 0 THEN FALSE
+            WHEN "PassCollisions" = 1 THEN TRUE
+            ELSE NULL
+            END;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/UserAccount.migrations b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
index c785463..31358fa 100644
--- a/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserAccount.migrations
@@ -48,4 +48,10 @@ ALTER TABLE UserAccounts ADD "UserTitle" varchar(64) NOT NULL DEFAULT '';
 
 COMMIT;
 
+:VERSION 5
 
+BEGIN TRANSACTION;
+
+ALTER TABLE UserAccounts ADD "active" integer NOT NULL DEFAULT 1;
+
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index a6bd8ca..26104c0 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -152,4 +152,12 @@ 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
+COMMIT;
+
+:VERSION 6         # -------------------------------
+
+BEGIN TRANSACTION;
+
+ALTER TABLE userpicks ADD "gatekeeper" varchar(255) COLLATE "default";
+
+COMMIT;
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs
index b1f234b..92c48bc 100644
--- a/OpenSim/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Properties/AssemblyInfo.cs
@@ -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.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
index d2e62d2..9884f74 100644
--- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
@@ -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.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
diff --git a/OpenSim/Data/SQLite/Resources/AgentPrefs.migrations b/OpenSim/Data/SQLite/Resources/AgentPrefs.migrations
index 7e0525d..8c2663e 100644
--- a/OpenSim/Data/SQLite/Resources/AgentPrefs.migrations
+++ b/OpenSim/Data/SQLite/Resources/AgentPrefs.migrations
@@ -11,7 +11,7 @@ CREATE TABLE `AgentPrefs` (
     `PermEveryone` INT(6) NOT NULL DEFAULT 0,
     `PermGroup` INT(6) NOT NULL DEFAULT 0,
     `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
-    UNIQUE KEY `PrincipalID` (`PrincipalID`),
+    UNIQUE (`PrincipalID`),
     PRIMARY KEY(`PrincipalID`));
 
 COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/AssetStore.migrations b/OpenSim/Data/SQLite/Resources/AssetStore.migrations
index f20631c..0743c45 100644
--- a/OpenSim/Data/SQLite/Resources/AssetStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/AssetStore.migrations
@@ -1,66 +1,17 @@
-:VERSION 1
+:VERSION 6
 
 BEGIN TRANSACTION;
-CREATE TABLE assets(
-       UUID varchar(255) primary key,
-       Name varchar(255),
-       Description varchar(255),
-       Type integer,
-       InvType integer,
-       Local integer,
-       Temporary integer,
-       Data blob);
 
-COMMIT;
-
-:VERSION 2
-
-BEGIN TRANSACTION;
-
-CREATE TEMPORARY TABLE assets_backup(UUID,Name,Description,Type,Local,Temporary,Data);
-INSERT INTO assets_backup SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets;
-DROP TABLE assets;
-CREATE TABLE assets(UUID,Name,Description,Type,Local,Temporary,Data);
-INSERT INTO assets SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets_backup;
-DROP TABLE assets_backup;
-
-COMMIT;
-
-:VERSION 3
-
-DELETE FROM assets WHERE UUID = 'dc4b9f0bd00845c696a401dd947ac621'
-
-:VERSION 4
-
-BEGIN;
-
-update assets
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-COMMIT;
-
-:VERSION 5
-
-BEGIN TRANSACTION;
-
-CREATE TEMPORARY TABLE assets_backup(UUID,Name,Description,Type,Local,Temporary,Data);
-INSERT INTO assets_backup SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets;
-DROP TABLE assets;
-CREATE TABLE assets(
-        UUID NOT NULL PRIMARY KEY,
-        Name,
-        Description,
-        Type,
-        Local,
-        Temporary,
-        asset_flags INTEGER NOT NULL DEFAULT 0,
-        CreatorID varchar(128) default '',
-        Data);
-        
-INSERT INTO assets(UUID,Name,Description,Type,Local,Temporary,Data) 
-SELECT UUID,Name,Description,Type,Local,Temporary,Data FROM assets_backup;
-DROP TABLE assets_backup;
+CREATE TABLE IF NOT EXISTS assets(
+        UUID NOT NULL PRIMARY KEY,
+        Name,
+        Description,
+        Type,
+        Local,
+        Temporary,
+        asset_flags INTEGER NOT NULL DEFAULT 0,
+        CreatorID varchar(128) default '',
+        Data);
 
 COMMIT;
 
diff --git a/OpenSim/Data/SQLite/Resources/EstateStore.migrations b/OpenSim/Data/SQLite/Resources/EstateStore.migrations
index 0aec49b..37fa1d9 100644
--- a/OpenSim/Data/SQLite/Resources/EstateStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/EstateStore.migrations
@@ -1,23 +1,27 @@
-:VERSION 6
+:VERSION 10
 
 BEGIN TRANSACTION;
 
-CREATE TABLE estate_groups (
+CREATE TABLE IF NOT EXISTS estate_groups (
   EstateID int(10) NOT NULL,
   uuid char(36) NOT NULL
 );
+CREATE INDEX estate_groups_estate_id on estate_groups(EstateID);
 
-CREATE TABLE estate_managers (
+CREATE TABLE IF NOT EXISTS estate_managers (
   EstateID int(10) NOT NULL,
   uuid char(36) NOT NULL
 );
+CREATE INDEX estate_managers_estate_id on estate_managers(EstateID);
 
-CREATE TABLE estate_map (
+CREATE TABLE IF NOT EXISTS estate_map (
   RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
   EstateID int(11) NOT NULL
 );
+CREATE INDEX estate_map_estate_id on estate_map(EstateID);
+CREATE UNIQUE INDEX estate_map_region_id on estate_map(RegionID);
 
-CREATE TABLE estate_settings (
+CREATE TABLE IF NOT EXISTS estate_settings (
   EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   EstateName varchar(64) default NULL,
   AbuseEmailToEstateOwner tinyint(4) NOT NULL,
@@ -38,60 +42,28 @@ CREATE TABLE estate_settings (
   SunPosition double NOT NULL,
   EstateSkipScripts tinyint(4) NOT NULL,
   BillableFactor float NOT NULL,
-  PublicAccess tinyint(4) NOT NULL
-);
-
-insert into estate_settings (
-        EstateID,EstateName,AbuseEmailToEstateOwner,DenyAnonymous,ResetHomeOnTeleport,FixedSun,DenyTransacted,BlockDwell,DenyIdentified,AllowVoice,UseGlobalTime,PricePerMeter,TaxFree,AllowDirectTeleport,RedirectGridX,RedirectGridY,ParentEstateID,SunPosition,PublicAccess,EstateSkipScripts,BillableFactor) 
-        values ( 99, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
-delete from estate_settings;
-
-CREATE TABLE estate_users (
+  PublicAccess tinyint(4) NOT NULL, 
+  AbuseEmail varchar(255) not null default '', 
+  EstateOwner varchar(36) not null default '', 
+  DenyMinors tinyint not null default 0, 
+  AllowLandmark tinyint not null default '1', 
+  AllowParcelChanges tinyint not null default '1', 
+  AllowSetHome tinyint not null default '1');
+
+CREATE TABLE IF NOT EXISTS estate_users (
   EstateID int(10) NOT NULL,
   uuid char(36) NOT NULL
 );
+CREATE INDEX estate_users_estate_id on estate_users(EstateID);
 
-CREATE TABLE estateban (
+CREATE TABLE IF NOT EXISTS estateban (
   EstateID int(10) NOT NULL,
   bannedUUID varchar(36) NOT NULL,
   bannedIp varchar(16) NOT NULL,
   bannedIpHostMask varchar(16) NOT NULL,
   bannedNameMask varchar(64) default NULL
 );
-
 CREATE INDEX estate_ban_estate_id on estateban(EstateID);
-CREATE INDEX estate_groups_estate_id on estate_groups(EstateID);
-CREATE INDEX estate_managers_estate_id on estate_managers(EstateID);
-CREATE INDEX estate_map_estate_id on estate_map(EstateID);
-CREATE UNIQUE INDEX estate_map_region_id on estate_map(RegionID);
-CREATE INDEX estate_users_estate_id on estate_users(EstateID);
 
 COMMIT;
 
-
-:VERSION 7
-
-begin;
-
-alter table estate_settings add column AbuseEmail varchar(255) not null default '';
-
-alter table estate_settings add column EstateOwner varchar(36) not null default '';
-
-commit;
-
-:VERSION 8
-
-begin;
-
-alter table estate_settings add column DenyMinors tinyint not null default 0;
-
-commit;
-
-:VERSION 9
-
-begin;
-alter table estate_settings add column AllowLandmark tinyint not null default '1';
-alter table estate_settings add column AllowParcelChanges tinyint not null default '1';
-alter table estate_settings add column AllowSetHome tinyint not null default '1';
-commit;
-
diff --git a/OpenSim/Data/SQLite/Resources/InventoryStore.migrations b/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
deleted file mode 100644
index 585ac49..0000000
--- a/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
+++ /dev/null
@@ -1,92 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION;
-
-CREATE TABLE inventoryfolders(
-       UUID varchar(255) primary key,
-       name varchar(255),
-       agentID varchar(255),
-       parentID varchar(255),
-       type integer,
-       version integer);
-
-CREATE TABLE inventoryitems(
-       UUID varchar(255) primary key,
-       assetID varchar(255),
-       assetType integer,
-       invType integer,
-       parentFolderID varchar(255),
-       avatarID varchar(255),
-       creatorsID varchar(255),
-       inventoryName varchar(255),
-       inventoryDescription varchar(255),
-       inventoryNextPermissions integer,
-       inventoryCurrentPermissions integer,
-       inventoryBasePermissions integer,
-       inventoryEveryOnePermissions integer, 
-       salePrice integer default 99, 
-       saleType integer default 0, 
-       creationDate integer default 2000, 
-       groupID varchar(255) default '00000000-0000-0000-0000-000000000000', 
-       groupOwned integer default 0, 
-       flags integer default 0);
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN TRANSACTION;
-
-create index inventoryfolders_agentid on inventoryfolders(agentid);
-create index inventoryfolders_parentid on inventoryfolders(parentid);
-create index inventoryitems_parentfolderid on inventoryitems(parentfolderid);
-create index inventoryitems_avatarid on inventoryitems(avatarid);
-
-COMMIT;
-
-:VERSION 3
-
-BEGIN;
-
-alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
-
-COMMIT;
-
-:VERSION 4
-
-BEGIN;
-
-update inventoryitems 
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-update inventoryitems
-  set assetID = substr(assetID, 1, 8) || "-" || substr(assetID, 9, 4) || "-" || substr(assetID, 13, 4) || "-" || substr(assetID, 17, 4) || "-" || substr(assetID, 21, 12) 
-  where assetID not like '%-%';
-
-update inventoryitems
-  set parentFolderID = substr(parentFolderID, 1, 8) || "-" || substr(parentFolderID, 9, 4) || "-" || substr(parentFolderID, 13, 4) || "-" || substr(parentFolderID, 17, 4) || "-" || substr(parentFolderID, 21, 12) 
-  where parentFolderID not like '%-%';
-
-update inventoryitems
-  set avatarID = substr(avatarID, 1, 8) || "-" || substr(avatarID, 9, 4) || "-" || substr(avatarID, 13, 4) || "-" || substr(avatarID, 17, 4) || "-" || substr(avatarID, 21, 12) 
-  where avatarID not like '%-%';
-
-update inventoryitems
-  set creatorsID = substr(creatorsID, 1, 8) || "-" || substr(creatorsID, 9, 4) || "-" || substr(creatorsID, 13, 4) || "-" || substr(creatorsID, 17, 4) || "-" || substr(creatorsID, 21, 12)
-  where creatorsID not like '%-%';
-
-
-update inventoryfolders
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-update inventoryfolders
-  set agentID = substr(agentID, 1, 8) || "-" || substr(agentID, 9, 4) || "-" || substr(agentID, 13, 4) || "-" || substr(agentID, 17, 4) || "-" || substr(agentID, 21, 12)
-  where agentID not like '%-%';
-
-update inventoryfolders
-  set parentID = substr(parentID, 1, 8) || "-" || substr(parentID, 9, 4) || "-" || substr(parentID, 13, 4) || "-" || substr(parentID, 17, 4) || "-" || substr(parentID, 21, 12)
-  where parentID not like '%-%';
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index 901068f..fb154cf 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -1,56 +1,99 @@
-:VERSION 1
+:VERSION 31
 
 BEGIN TRANSACTION;
 
-CREATE TABLE prims(
-       UUID varchar(255) primary key,
-       RegionUUID varchar(255),
-       ParentID integer,
-       CreationDate integer,
-       Name varchar(255),
-       SceneGroupID varchar(255),
-       Text varchar(255),
-       Description varchar(255),
-       SitName varchar(255),
-       TouchName varchar(255),
-       CreatorID varchar(255),
-       OwnerID varchar(255),
-       GroupID varchar(255),
-       LastOwnerID varchar(255),
-       OwnerMask integer,
-       NextOwnerMask integer,
-       GroupMask integer,
-       EveryoneMask integer,
-       BaseMask integer,
-       PositionX float,
-       PositionY float,
-       PositionZ float,
-       GroupPositionX float,
-       GroupPositionY float,
-       GroupPositionZ float,
-       VelocityX float,
-       VelocityY float,
-       VelocityZ float,
-       AngularVelocityX float,
-       AngularVelocityY float,
-       AngularVelocityZ float,
-       AccelerationX float,
-       AccelerationY float,
-       AccelerationZ float,
-       RotationX float,
-       RotationY float,
-       RotationZ float,
-       RotationW float, 
-       ObjectFlags integer, 
-       SitTargetOffsetX float NOT NULL default 0, 
-       SitTargetOffsetY float NOT NULL default 0, 
-       SitTargetOffsetZ float NOT NULL default 0, 
-       SitTargetOrientW float NOT NULL default 0, 
-       SitTargetOrientX float NOT NULL default 0, 
-       SitTargetOrientY float NOT NULL default 0, 
-       SitTargetOrientZ float NOT NULL default 0);
-
-CREATE TABLE primshapes(
+CREATE TABLE IF NOT EXISTS prims(
+    UUID varchar(255) primary key,
+    RegionUUID varchar(255),
+        CreationDate integer,
+        Name varchar(255),
+        SceneGroupID varchar(255),
+        Text varchar(255),
+        Description varchar(255),
+        SitName varchar(255),
+        TouchName varchar(255),
+        CreatorID varchar(255),
+        OwnerID varchar(255),
+        GroupID varchar(255),
+        LastOwnerID varchar(255),
+        OwnerMask integer,
+        NextOwnerMask integer,
+        GroupMask integer,
+        EveryoneMask integer,
+        BaseMask integer,
+        PositionX float,
+        PositionY float,
+        PositionZ float,
+        GroupPositionX float,
+        GroupPositionY float,
+        GroupPositionZ float,
+        VelocityX float,
+        VelocityY float,
+        VelocityZ float,
+        AngularVelocityX float,
+        AngularVelocityY float,
+        AngularVelocityZ float,
+        AccelerationX float,
+        AccelerationY float,
+        AccelerationZ float,
+        RotationX float,
+        RotationY float,
+        RotationZ float,
+        RotationW float,
+        ObjectFlags integer,
+        SitTargetOffsetX float NOT NULL default 0,
+        SitTargetOffsetY float NOT NULL default 0,
+        SitTargetOffsetZ float NOT NULL default 0,
+        SitTargetOrientW float NOT NULL default 0,
+        SitTargetOrientX float NOT NULL default 0,
+        SitTargetOrientY float NOT NULL default 0,
+        SitTargetOrientZ float NOT NULL default 0,
+        ColorR integer not null default 0,
+        ColorG integer not null default 0,
+        ColorB integer not null default 0,
+        ColorA integer not null default 0,
+        ClickAction integer not null default 0,
+        PayPrice integer not null default 0,
+        PayButton1 integer not null default 0,
+        PayButton2 integer not null default 0,
+        PayButton3 integer not null default 0,
+        PayButton4 integer not null default 0,
+        LoopedSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+        LoopedSoundGain float NOT NULL default 0,
+        TextureAnimation string,
+        ParticleSystem string,
+        OmegaX float NOT NULL default 0,
+        OmegaY float NOT NULL default 0,
+        OmegaZ float NOT NULL default 0,
+        CameraEyeOffsetX float NOT NULL default 0,
+        CameraEyeOffsetY float NOT NULL default 0,
+        CameraEyeOffsetZ float NOT NULL default 0,
+        CameraAtOffsetX float NOT NULL default 0,
+        CameraAtOffsetY float NOT NULL default 0,
+        CameraAtOffsetZ float NOT NULL default 0,
+        ForceMouselook string NOT NULL default 0,
+        ScriptAccessPin INTEGER NOT NULL default 0,
+        AllowedDrop INTEGER NOT NULL default 0,
+        DieAtEdge string NOT NULL default 0,
+        SalePrice INTEGER NOT NULL default 0,
+        SaleType string NOT NULL default 0,
+        Material INTEGER NOT NULL default 3,
+        CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+        CollisionSoundVolume float NOT NULL default 0,
+        VolumeDetect INTEGER NOT NULL DEFAULT 0, 
+        MediaURL varchar(255), 
+        DynAttrs TEXT, 
+        `PhysicsShapeType` tinyint(4) NOT NULL default '0', 
+        `Density` double NOT NULL default '1000', 
+        `GravityModifier` double NOT NULL default '1', 
+        `Friction` double NOT NULL default '0.6', 
+        `Restitution` double NOT NULL default '0.5', 
+        `KeyframeMotion` blob, 
+        AttachedPosX double default '0', 
+        AttachedPosY double default '0', 
+        AttachedPosZ double default '0');
+
+CREATE TABLE IF NOT EXISTS primshapes(
        UUID varchar(255) primary key,
        Shape integer,
        ScaleX float,
@@ -76,10 +119,12 @@ CREATE TABLE primshapes(
        ProfileCurve integer,
        ProfileHollow integer,
        Texture blob,
-       ExtraParams blob, 
-       State Integer NOT NULL default 0);
+       ExtraParams blob,
+       State Integer NOT NULL default 0, 
+           Media TEXT, 
+           LastAttachPoint int not null default '0');
 
-CREATE TABLE primitems(
+CREATE TABLE IF NOT EXISTS primitems(
        itemID varchar(255) primary key,
        primID varchar(255),
        assetID varchar(255),
@@ -97,14 +142,15 @@ CREATE TABLE primitems(
        currentPermissions string,
        basePermissions string,
        everyonePermissions string,
-       groupPermissions string);
+       groupPermissions string, 
+           flags integer not null default 0);
 
-CREATE TABLE terrain(
+CREATE TABLE IF NOT EXISTS terrain(
        RegionUUID varchar(255),
        Revision integer,
        Heightfield blob);
 
-CREATE TABLE land(
+CREATE TABLE IF NOT EXISTS land(
        UUID varchar(255) primary key,
        RegionUUID varchar(255),
        LocalLandID string,
@@ -135,92 +181,30 @@ CREATE TABLE land(
        UserLocationZ float,
        UserLookAtX float,
        UserLookAtY float,
-       UserLookAtZ float, 
-       AuthbuyerID varchar(36) NOT NULL default  '00000000-0000-0000-0000-000000000000');
-
-CREATE TABLE landaccesslist(
+       UserLookAtZ float,
+       AuthbuyerID varchar(36) NOT NULL default  '00000000-0000-0000-0000-000000000000', 
+           OtherCleanTime INTEGER NOT NULL default 0, 
+           Dwell INTEGER NOT NULL default 0, 
+           `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none', 
+           `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '', 
+           `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0', 
+           `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE, 
+           `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE, 
+           `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE);
+
+CREATE TABLE IF NOT EXISTS landaccesslist(
        LandUUID varchar(255),
        AccessUUID varchar(255),
        Flags string);
 
-COMMIT;
-
-:VERSION 2
-
-BEGIN TRANSACTION;
-
-CREATE TABLE regionban(
-                regionUUID varchar (255),
-                bannedUUID varchar (255),
-                bannedIp varchar (255),
-                bannedIpHostMask varchar (255)
-                );
-       
-COMMIT;
-
-:VERSION 3
-
-BEGIN;
-
-ALTER TABLE primitems add flags integer not null default 0;
-
-COMMIT;
-
-:VERSION 4
-
-BEGIN;
-
-create table regionsettings (
-        regionUUID char(36) not null,
-        block_terraform integer not null,
-        block_fly integer not null,
-        allow_damage integer not null,
-        restrict_pushing integer not null,
-        allow_land_resell integer not null,
-        allow_land_join_divide integer not null,
-        block_show_in_search integer not null,
-        agent_limit integer not null,
-        object_bonus float not null,
-        maturity integer not null,
-        disable_scripts integer not null,
-        disable_collisions integer not null,
-        disable_physics integer not null,
-        terrain_texture_1 char(36) not null,
-        terrain_texture_2 char(36) not null,
-        terrain_texture_3 char(36) not null,
-        terrain_texture_4 char(36) not null,
-        elevation_1_nw float not null,
-        elevation_2_nw float not null,
-        elevation_1_ne float not null,
-        elevation_2_ne float not null,
-        elevation_1_se float not null,
-        elevation_2_se float not null,
-        elevation_1_sw float not null,
-        elevation_2_sw float not null,
-        water_height float not null,
-        terrain_raise_limit float not null,
-        terrain_lower_limit float not null,
-        use_estate_sun integer not null,
-        fixed_sun integer not null,
-        sun_position float not null,
-        covenant char(36));
-
-COMMIT;
-
-:VERSION 5
-
-BEGIN;
-
-delete from regionsettings;
-
-COMMIT;
-
-:VERSION 6
+CREATE TABLE IF NOT EXISTS regionban(
+                regionUUID varchar (255),
+                bannedUUID varchar (255),
+                bannedIp varchar (255),
+                bannedIpHostMask varchar (255)
+                );
 
-BEGIN TRANSACTION;
-
-drop table regionsettings;
-CREATE TABLE regionsettings (
+CREATE TABLE IF NOT EXISTS regionsettings (
   regionUUID char(36) NOT NULL,
   block_terraform int(11) NOT NULL,
   block_fly int(11) NOT NULL,
@@ -254,228 +238,18 @@ CREATE TABLE regionsettings (
   fixed_sun int(11) NOT NULL,
   sun_position float NOT NULL,
   covenant char(36) default NULL,
-  sandbox tinyint(4) NOT NULL,
+  sandbox tinyint(4) NOT NULL, 
+  sunvectorx double NOT NULL default 0, 
+  sunvectory double NOT NULL default 0, 
+  sunvectorz double NOT NULL default 0, 
+  map_tile_ID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000', 
+  covenant_datetime INTEGER NOT NULL default 0, 
+  `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', 
+  `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
   PRIMARY KEY  (regionUUID)
 );
 
-COMMIT;
-
-:VERSION 9
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN ColorR integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorG integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorB integer not null default 0;
-ALTER TABLE prims ADD COLUMN ColorA integer not null default 0;
-
-COMMIT;
-
-:VERSION 10
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN ClickAction INTEGER NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 11
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN PayPrice INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN PayButton1 INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN PayButton2 INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN PayButton3 INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN PayButton4 INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN LoopedSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE prims ADD COLUMN LoopedSoundGain float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN TextureAnimation string;
-ALTER TABLE prims ADD COLUMN ParticleSystem string;
-ALTER TABLE prims ADD COLUMN OmegaX float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN OmegaY float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN OmegaZ float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetX float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetY float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraEyeOffsetZ float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetX float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetY float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN CameraAtOffsetZ float NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN ForceMouselook string NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN ScriptAccessPin INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN AllowedDrop INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN DieAtEdge string NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN SalePrice INTEGER NOT NULL default 0;
-ALTER TABLE prims ADD COLUMN SaleType string NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 12
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN Material INTEGER NOT NULL default 3;
-
-COMMIT;
-
-:VERSION 13
-
-BEGIN;
-
-ALTER TABLE land ADD COLUMN OtherCleanTime INTEGER NOT NULL default 0;
-ALTER TABLE land ADD COLUMN Dwell INTEGER NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 14
-
-begin;
-
-ALTER TABLE regionsettings ADD COLUMN sunvectorx double NOT NULL default 0;
-ALTER TABLE regionsettings ADD COLUMN sunvectory double NOT NULL default 0;
-ALTER TABLE regionsettings ADD COLUMN sunvectorz double NOT NULL default 0;
-
-commit;
-
-:VERSION 15
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN CollisionSound varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE prims ADD COLUMN CollisionSoundVolume float NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 16
-
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN VolumeDetect INTEGER NOT NULL DEFAULT 0;
-
-COMMIT;
-
-:VERSION 17
-
-BEGIN;
-CREATE TEMPORARY TABLE prims_backup(UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,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,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect);
-INSERT INTO prims_backup SELECT UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,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,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect FROM prims;
-DROP TABLE prims;
-CREATE TABLE prims(UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,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,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect);
-INSERT INTO prims SELECT UUID,RegionUUID,CreationDate,Name,SceneGroupID,Text,Description,SitName,TouchName,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,ObjectFlags,SitTargetOffsetX,SitTargetOffsetY,SitTargetOffsetZ,SitTargetOrientW,SitTargetOrientX,SitTargetOrientY,SitTargetOrientZ,ColorR,ColorG,ColorB,ColorA,ClickAction,PayPrice,PayButton1,PayButton2,PayButton3,PayButton4,LoopedSound,LoopedSoundGain,TextureAnimation,ParticleSystem,OmegaX,OmegaY,OmegaZ,CameraEyeOffsetX,CameraEyeOffsetY,CameraEyeOffsetZ,CameraAtOffsetX,CameraAtOffsetY,CameraAtOffsetZ,ForceMouselook,ScriptAccessPin,AllowedDrop,DieAtEdge,SalePrice,SaleType,Material,CollisionSound,CollisionSoundVolume,VolumeDetect FROM prims_backup;
-DROP TABLE prims_backup;
-COMMIT;
-
-:VERSION 18
-
-BEGIN;
-
-update terrain 
-  set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12)
-  where RegionUUID not like '%-%';
-  
-
-update landaccesslist
-  set LandUUID = substr(LandUUID, 1, 8) || "-" || substr(LandUUID, 9, 4) || "-" || substr(LandUUID, 13, 4) || "-" || substr(LandUUID, 17, 4) || "-" || substr(LandUUID, 21, 12) 
-  where LandUUID not like '%-%';
-
-update landaccesslist
-  set AccessUUID = substr(AccessUUID, 1, 8) || "-" || substr(AccessUUID, 9, 4) || "-" || substr(AccessUUID, 13, 4) || "-" || substr(AccessUUID, 17, 4) || "-" || substr(AccessUUID, 21, 12) 
-  where AccessUUID not like '%-%';
-  
-
-update prims
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12) 
-  where UUID not like '%-%';
-
-update prims
-  set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12) 
-  where RegionUUID not like '%-%';
-
-update prims
-  set SceneGroupID = substr(SceneGroupID, 1, 8) || "-" || substr(SceneGroupID, 9, 4) || "-" || substr(SceneGroupID, 13, 4) || "-" || substr(SceneGroupID, 17, 4) || "-" || substr(SceneGroupID, 21, 12) 
-  where SceneGroupID not like '%-%';
-
-update prims
-  set CreatorID = substr(CreatorID, 1, 8) || "-" || substr(CreatorID, 9, 4) || "-" || substr(CreatorID, 13, 4) || "-" || substr(CreatorID, 17, 4) || "-" || substr(CreatorID, 21, 12) 
-  where CreatorID not like '%-%';
-
-update prims
-  set OwnerID = substr(OwnerID, 1, 8) || "-" || substr(OwnerID, 9, 4) || "-" || substr(OwnerID, 13, 4) || "-" || substr(OwnerID, 17, 4) || "-" || substr(OwnerID, 21, 12) 
-  where OwnerID not like '%-%';
-
-update prims
-  set GroupID = substr(GroupID, 1, 8) || "-" || substr(GroupID, 9, 4) || "-" || substr(GroupID, 13, 4) || "-" || substr(GroupID, 17, 4) || "-" || substr(GroupID, 21, 12) 
-  where GroupID not like '%-%';
-
-update prims
-  set LastOwnerID = substr(LastOwnerID, 1, 8) || "-" || substr(LastOwnerID, 9, 4) || "-" || substr(LastOwnerID, 13, 4) || "-" || substr(LastOwnerID, 17, 4) || "-" || substr(LastOwnerID, 21, 12) 
-  where LastOwnerID not like '%-%';
-
-
-update primshapes
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12) 
-  where UUID not like '%-%';
-
-
-update land
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12) 
-  where UUID not like '%-%';
-  
-update land
-  set RegionUUID = substr(RegionUUID, 1, 8) || "-" || substr(RegionUUID, 9, 4) || "-" || substr(RegionUUID, 13, 4) || "-" || substr(RegionUUID, 17, 4) || "-" || substr(RegionUUID, 21, 12)
-  where RegionUUID not like '%-%';
-
-update land
-  set OwnerUUID = substr(OwnerUUID, 1, 8) || "-" || substr(OwnerUUID, 9, 4) || "-" || substr(OwnerUUID, 13, 4) || "-" || substr(OwnerUUID, 17, 4) || "-" || substr(OwnerUUID, 21, 12)
-  where OwnerUUID not like '%-%';
-
-update land
-  set GroupUUID = substr(GroupUUID, 1, 8) || "-" || substr(GroupUUID, 9, 4) || "-" || substr(GroupUUID, 13, 4) || "-" || substr(GroupUUID, 17, 4) || "-" || substr(GroupUUID, 21, 12)
-  where GroupUUID not like '%-%';
-
-update land
-  set MediaTextureUUID = substr(MediaTextureUUID, 1, 8) || "-" || substr(MediaTextureUUID, 9, 4) || "-" || substr(MediaTextureUUID, 13, 4) || "-" || substr(MediaTextureUUID, 17, 4) || "-" || substr(MediaTextureUUID, 21, 12)
-  where MediaTextureUUID not like '%-%';
-
-update land
-  set SnapshotUUID = substr(SnapshotUUID, 1, 8) || "-" || substr(SnapshotUUID, 9, 4) || "-" || substr(SnapshotUUID, 13, 4) || "-" || substr(SnapshotUUID, 17, 4) || "-" || substr(SnapshotUUID, 21, 12)
-  where SnapshotUUID not like '%-%';
-
-update land
-  set AuthbuyerID = substr(AuthbuyerID, 1, 8) || "-" || substr(AuthbuyerID, 9, 4) || "-" || substr(AuthbuyerID, 13, 4) || "-" || substr(AuthbuyerID, 17, 4) || "-" || substr(AuthbuyerID, 21, 12)
-  where AuthbuyerID not like '%-%';
-  
-COMMIT;
-
-:VERSION 19
-BEGIN;
-ALTER TABLE regionsettings ADD COLUMN map_tile_ID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-COMMIT;
-
-:VERSION 20
-BEGIN;
-ALTER TABLE prims ADD COLUMN MediaURL varchar(255);
-ALTER TABLE primshapes ADD COLUMN Media TEXT;
-COMMIT;
-
-:VERSION 21
-BEGIN;
-ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none';
-ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '';
-ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0';
-ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
-ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
-ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
-COMMIT;
-
-:VERSION 22
-BEGIN;
-ALTER TABLE regionsettings ADD COLUMN covenant_datetime INTEGER NOT NULL default 0;
-COMMIT;
-
-:VERSION 23
-BEGIN;
-CREATE TABLE regionwindlight (
+CREATE TABLE IF NOT EXISTS regionwindlight (
   region_id VARCHAR(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
   water_color_r FLOAT NOT NULL DEFAULT '4.000000',
   water_color_g FLOAT NOT NULL DEFAULT '38.000000',
@@ -541,13 +315,6 @@ CREATE TABLE regionwindlight (
   cloud_scroll_y_lock INTEGER NOT NULL DEFAULT '0',
   draw_classic_clouds INTEGER NOT NULL DEFAULT '1');
 
-COMMIT;
-
-
-:VERSION 24
-
-BEGIN;
-
 CREATE TABLE IF NOT EXISTS `spawn_points` (
   `RegionID` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
   `Yaw` float NOT NULL,
@@ -555,60 +322,58 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
   `Distance` float NOT NULL
 );
 
-ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+CREATE TABLE IF NOT EXISTS `regionenvironment` (
+  `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
+  `llsd_settings` TEXT NOT NULL
+);
 
 COMMIT;
 
-:VERSION 25
-
-BEGIN;
-ALTER TABLE `regionsettings` ADD COLUMN `parcel_tile_ID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
 
-:VERSION 26
+:VERSION 32         #---- avination fields plus a few others
 
 BEGIN;
 
-CREATE TABLE `regionenvironment` (
-  `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000' PRIMARY KEY,
-  `llsd_settings` TEXT NOT NULL
-);
+ALTER TABLE `prims` ADD COLUMN `PassTouches` BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `prims` ADD COLUMN `PassCollisions`BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `prims` ADD COLUMN `Vehicle` TEXT default NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `block_search` BOOLEAN NOT NULL DEFAULT FALSE;;
+ALTER TABLE `regionsettings` ADD COLUMN `casino` BOOLEAN NOT NULL DEFAULT FALSE;;
+ALTER TABLE `land` ADD COLUMN `SeeAVs` BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE `land` ADD COLUMN `AnyAVSounds` BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE `land` ADD COLUMN `GroupAVSounds` BOOLEAN NOT NULL DEFAULT TRUE;
 
 COMMIT;
 
-:VERSION 27
-BEGIN;
-ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
-COMMIT;
-
-:VERSION 28
+:VERSION 33         #---- Rotation axis locks
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0';
-ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000';
-ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1';
-ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
-ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
+ALTER TABLE prims ADD COLUMN `RotationAxisLocks` tinyint(4) NOT NULL default '0';
 
 COMMIT;
 
-:VERSION 29       #---------------- Keyframes
+:VERSION 34         #---- add baked terrain store
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
+CREATE TABLE IF NOT EXISTS bakedterrain(
+       RegionUUID varchar(255),
+       Revision integer,
+       Heightfield blob);
 
 COMMIT;
 
-:VERSION 30       #---------------- Save Attachment info
+:VERSION 35         #----- Add RezzerID field in table prims
 
 BEGIN;
 
-ALTER TABLE prims ADD COLUMN AttachedPosX double default '0';
-ALTER TABLE prims ADD COLUMN AttachedPosY double default '0';
-ALTER TABLE prims ADD COLUMN AttachedPosZ double default '0';
-ALTER TABLE primshapes ADD COLUMN LastAttachPoint int not null default '0';
+ALTER TABLE `prims` ADD COLUMN `RezzerID` char(36) DEFAULT NULL;
 
 COMMIT;
 
+:VERSION 36         #----- Add physics inertia data
+
+BEGIN;
+ALTER TABLE `prims` ADD COLUMN `PhysInertia` TEXT default NULL;
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/UserAccount.migrations b/OpenSim/Data/SQLite/Resources/UserAccount.migrations
index 854fe69..f37a222 100644
--- a/OpenSim/Data/SQLite/Resources/UserAccount.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserAccount.migrations
@@ -25,3 +25,11 @@ 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, surname AS LastName, '' as Email, '' AS ServiceURLs, created as Created FROM users;
 
 COMMIT;
+
+:VERSION 3              # -------------------------
+
+BEGIN;
+
+ALTER TABLE `UserAccounts` ADD `active` BOOLEAN NOT NULL DEFAULT TRUE;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
index 86434e8..207dde0 100644
--- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -99,4 +99,4 @@ CREATE TABLE IF NOT EXISTS usersettings (
   email varchar(254) NOT NULL,
   PRIMARY KEY (useruuid)
 )
-commit;
\ No newline at end of file
+commit;
diff --git a/OpenSim/Data/SQLite/Resources/UserStore.migrations b/OpenSim/Data/SQLite/Resources/UserStore.migrations
deleted file mode 100644
index 73d35e8..0000000
--- a/OpenSim/Data/SQLite/Resources/UserStore.migrations
+++ /dev/null
@@ -1,169 +0,0 @@
-:VERSION 1
-
-BEGIN TRANSACTION;
-
--- users table
-CREATE TABLE users(
-       UUID varchar(255) primary key,
-       username varchar(255),
-       surname varchar(255),
-       passwordHash varchar(255),
-       passwordSalt varchar(255),
-       homeRegionX integer,
-       homeRegionY integer,
-       homeLocationX float,
-       homeLocationY float,
-       homeLocationZ float,
-       homeLookAtX float,
-       homeLookAtY float,
-       homeLookAtZ float,
-       created integer,
-       lastLogin integer,
-       rootInventoryFolderID varchar(255),
-       userInventoryURI varchar(255),
-       userAssetURI varchar(255),
-       profileCanDoMask integer,
-       profileWantDoMask integer,
-       profileAboutText varchar(255),
-       profileFirstText varchar(255),
-       profileImage varchar(255),
-       profileFirstImage varchar(255), 
-       webLoginKey text default '00000000-0000-0000-0000-000000000000');
--- friends table
-CREATE TABLE userfriends(
-       ownerID varchar(255),
-       friendID varchar(255),
-       friendPerms integer,
-       ownerPerms integer,
-       datetimestamp integer);
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN;
-
-ALTER TABLE users add homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 3
-
-BEGIN;
-
-ALTER TABLE users add userFlags integer NOT NULL default 0;
-ALTER TABLE users add godLevel integer NOT NULL default 0;
-
-COMMIT;
-
-:VERSION 4
-
-BEGIN;
-
-ALTER TABLE users add customType varchar(32) not null default '';
-ALTER TABLE users add partner char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
-
-:VERSION 5
-
-BEGIN;
-
-CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', `attachpoint` int(11) NOT NULL DEFAULT 0, `item` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', `asset` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000');
-
-COMMIT;
-
-:VERSION 6
-
-BEGIN TRANSACTION;
-
--- usersagents table
-CREATE TABLE IF NOT EXISTS useragents(
-       UUID varchar(255) primary key,
-       agentIP varchar(255),
-       agentPort integer,
-       agentOnline boolean,
-       sessionID varchar(255),
-       secureSessionID varchar(255),
-       regionID varchar(255),
-       loginTime integer,
-       logoutTime integer,
-       currentRegion varchar(255),
-       currentHandle varchar(255),
-       currentPosX float,
-       currentPosY float,
-       currentPosZ float);
-
-COMMIT;
-
-:VERSION 7
-
-BEGIN TRANSACTION;
-
-ALTER TABLE useragents add currentLookAtX float not null default 128;
-ALTER TABLE useragents add currentLookAtY float not null default 128;
-ALTER TABLE useragents add currentLookAtZ float not null default 70;
-
-COMMIT;
-
-:VERSION 8
-
-BEGIN TRANSACTION;
-
-ALTER TABLE users add email varchar(250);
-
-COMMIT;
-
-:VERSION 9
-
-BEGIN;
-
-update users
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-update useragents
-  set UUID = substr(UUID, 1, 8) || "-" || substr(UUID, 9, 4) || "-" || substr(UUID, 13, 4) || "-" || substr(UUID, 17, 4) || "-" || substr(UUID, 21, 12)
-  where UUID not like '%-%';
-
-COMMIT;
-
-:VERSION 10
-
-BEGIN TRANSACTION;
-
-CREATE TABLE IF NOT EXISTS avatarappearance(
-  Owner varchar(36) NOT NULL primary key,
-  BodyItem varchar(36) DEFAULT NULL,
-  BodyAsset varchar(36) DEFAULT NULL,
-  SkinItem varchar(36) DEFAULT NULL,
-  SkinAsset varchar(36) DEFAULT NULL,
-  HairItem varchar(36) DEFAULT NULL,
-  HairAsset varchar(36) DEFAULT NULL,
-  EyesItem varchar(36) DEFAULT NULL,
-  EyesAsset varchar(36) DEFAULT NULL,
-  ShirtItem varchar(36) DEFAULT NULL,
-  ShirtAsset varchar(36) DEFAULT NULL,
-  PantsItem varchar(36) DEFAULT NULL,
-  PantsAsset varchar(36) DEFAULT NULL,
-  ShoesItem varchar(36) DEFAULT NULL,
-  ShoesAsset varchar(36) DEFAULT NULL,
-  SocksItem varchar(36) DEFAULT NULL,
-  SocksAsset varchar(36) DEFAULT NULL,
-  JacketItem varchar(36) DEFAULT NULL,
-  JacketAsset varchar(36) DEFAULT NULL,
-  GlovesItem varchar(36) DEFAULT NULL,
-  GlovesAsset varchar(36) DEFAULT NULL,
-  UnderShirtItem varchar(36) DEFAULT NULL,
-  UnderShirtAsset varchar(36) DEFAULT NULL,
-  UnderPantsItem varchar(36) DEFAULT NULL,
-  UnderPantsAsset varchar(36) DEFAULT NULL,
-  SkirtItem varchar(36) DEFAULT NULL,
-  SkirtAsset varchar(36) DEFAULT NULL,
-  Texture blob,
-  VisualParams blob,
-  Serial int DEFAULT NULL,
-  AvatarHeight float DEFAULT NULL
-);
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 30b26c4..966d0b8 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite
 
             if (dbconnect == string.Empty)
             {
-                dbconnect = "URI=file:../db/Asset.db,version=3";
+                dbconnect = "URI=file:Asset.db,version=3";
             }
             m_conn = new SqliteConnection(dbconnect);
             m_conn.Open();
@@ -131,14 +131,14 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             string assetName = asset.Name;
             if (asset.Name.Length > AssetBase.MAX_ASSET_NAME)
             {
                 assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Name, asset.ID, asset.Name.Length, assetName.Length);
             }
 
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
             {
                 assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC);
                 m_log.WarnFormat(
-                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add",
                     asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
 
@@ -171,6 +171,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -191,6 +192,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -358,7 +360,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         override public void Initialise()
         {
-            Initialise("URI=file:../db/Asset.db,version=3");
+            Initialise("URI=file:Asset.db,version=3");
         }
 
         /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 0428c11..8fb955c 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Data.SQLite
     public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private string m_Realm;
         private List<string> m_ColumnNames;
         private int m_LastExpire;
@@ -223,7 +223,7 @@ namespace OpenSim.Data.SQLite
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
+            using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() +
                 "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))"))
             {
                 if (ExecuteNonQuery(cmd, m_Connection) > 0)
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
 
-            using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
+            using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() +
                 " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"))
             {
                 if (ExecuteNonQuery(cmd, m_Connection) > 0)
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index d51f2d4..0fcab21 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite
             IDataReader r = null;
 
             using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-            {            
+            {
                 names.Remove("EstateID");
 
                 string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
@@ -386,15 +386,15 @@ namespace OpenSim.Data.SQLite
                 return DoLoad(cmd, UUID.Zero, false);
             }
         }
-        
+
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> estateSettings = new List<EstateSettings>();
-            
+
             List<int> estateIds = GetEstatesAll();
             foreach (int estateId in estateIds)
                 estateSettings.Add(LoadEstateSettings(estateId));
-            
+
             return estateSettings;
         }
 
@@ -421,7 +421,7 @@ namespace OpenSim.Data.SQLite
 
             return result;
         }
-        
+
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
@@ -442,7 +442,7 @@ namespace OpenSim.Data.SQLite
             }
             r.Close();
 
-            return result;            
+            return result;
         }
 
         public List<int> GetEstatesByOwner(UUID ownerID)
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 9fbeb10..a4b84b1 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Data.SQLite
                         m_Fields[name].SetValue(row, reader[name]);
                     }
                 }
-                
+
                 if (m_DataField != null)
                 {
                     Dictionary<string, string> data =
@@ -268,7 +268,7 @@ namespace OpenSim.Data.SQLite
         public virtual bool Delete(string field, string key)
         {
             return Delete(new string[] { field }, new string[] { key });
-        }        
+        }
 
         public virtual bool Delete(string[] fields, string[] keys)
         {
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index d8c52f8..987240c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.SQLite
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public SQLiteGridUserData(string connectionString, string realm) 
+        public SQLiteGridUserData(string connectionString, string realm)
             : base(connectionString, realm, "GridUserStore") {}
 
         public new GridUserData Get(string userID)
diff --git a/OpenSim/Data/SQLite/SQLiteHGTravelData.cs b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
index db288b2..dd34710 100644
--- a/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
+++ b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public SQLiteHGTravelData(string connectionString, string realm) 
+        public SQLiteHGTravelData(string connectionString, string realm)
             : base(connectionString, realm, "HGTravelStore") {}
 
         public HGTravelingData Get(UUID sessionID)
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
deleted file mode 100644
index 7caf347..0000000
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using log4net;
-#if CSharpSqlite
-    using Community.CsharpSqlite.Sqlite;
-#else
-    using Mono.Data.Sqlite;
-#endif
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.SQLite
-{
-    /// <summary>
-    /// An Inventory Interface to the SQLite database
-    /// </summary>
-    public class SQLiteInventoryStore : SQLiteUtil, IInventoryDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private const string invItemsSelect = "select * from inventoryitems";
-        private const string invFoldersSelect = "select * from inventoryfolders";
-
-        private static SqliteConnection conn;
-        private static DataSet ds;
-        private static SqliteDataAdapter invItemsDa;
-        private static SqliteDataAdapter invFoldersDa;
-
-        private static bool m_Initialized = false;
-
-        public void Initialise()
-        {
-            m_log.Info("[SQLiteInventoryData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// <list type="bullet">
-        /// <item>Initialises Inventory interface</item>
-        /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
-        /// <item>use default URI if connect string string is empty.</item>
-        /// </list>
-        /// </summary>
-        /// <param name="dbconnect">connect string</param>
-        public void Initialise(string dbconnect)
-        {
-            if (!m_Initialized)
-            {
-                m_Initialized = true;
-
-                if (Util.IsWindows())
-                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-
-                if (dbconnect == string.Empty)
-                {
-                    dbconnect = "URI=file:../db/inventoryStore.db,version=3";
-                }
-                m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
-                conn = new SqliteConnection(dbconnect);
-
-                conn.Open();
-
-                Assembly assem = GetType().Assembly;
-                Migration m = new Migration(conn, assem, "InventoryStore");
-                m.Update();
-
-                SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn);
-                invItemsDa = new SqliteDataAdapter(itemsSelectCmd);
-                //            SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
-
-                SqliteCommand foldersSelectCmd = new SqliteCommand(invFoldersSelect, conn);
-                invFoldersDa = new SqliteDataAdapter(foldersSelectCmd);
-
-                ds = new DataSet();
-
-                ds.Tables.Add(createInventoryFoldersTable());
-                invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
-                setupFoldersCommands(invFoldersDa, conn);
-                CreateDataSetMapping(invFoldersDa, "inventoryfolders");
-                m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
-
-                ds.Tables.Add(createInventoryItemsTable());
-                invItemsDa.Fill(ds.Tables["inventoryitems"]);
-                setupItemsCommands(invItemsDa, conn);
-                CreateDataSetMapping(invItemsDa, "inventoryitems");
-                m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
-
-                ds.AcceptChanges();
-            }
-        }
-
-        /// <summary>
-        /// Closes the inventory interface
-        /// </summary>
-        public void Dispose()
-        {
-            if (conn != null)
-            {
-                conn.Close();
-                conn = null;
-            }
-            if (invItemsDa != null)
-            {
-                invItemsDa.Dispose();
-                invItemsDa = null;
-            }
-            if (invFoldersDa != null)
-            {
-                invFoldersDa.Dispose();
-                invFoldersDa = null;
-            }
-            if (ds != null)
-            {
-                ds.Dispose();
-                ds = null;
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        public InventoryItemBase buildItem(DataRow row)
-        {
-            InventoryItemBase item = new InventoryItemBase();
-            item.ID = new UUID((string) row["UUID"]);
-            item.AssetID = new UUID((string) row["assetID"]);
-            item.AssetType = Convert.ToInt32(row["assetType"]);
-            item.InvType = Convert.ToInt32(row["invType"]);
-            item.Folder = new UUID((string) row["parentFolderID"]);
-            item.Owner = new UUID((string) row["avatarID"]);
-            item.CreatorIdentification = (string)row["creatorsID"];
-            item.Name = (string) row["inventoryName"];
-            item.Description = (string) row["inventoryDescription"];
-
-            item.NextPermissions = Convert.ToUInt32(row["inventoryNextPermissions"]);
-            item.CurrentPermissions = Convert.ToUInt32(row["inventoryCurrentPermissions"]);
-            item.BasePermissions = Convert.ToUInt32(row["inventoryBasePermissions"]);
-            item.EveryOnePermissions = Convert.ToUInt32(row["inventoryEveryOnePermissions"]);
-            item.GroupPermissions = Convert.ToUInt32(row["inventoryGroupPermissions"]);
-
-            // new fields
-            if (!Convert.IsDBNull(row["salePrice"]))
-                item.SalePrice = Convert.ToInt32(row["salePrice"]);
-
-            if (!Convert.IsDBNull(row["saleType"]))
-                item.SaleType = Convert.ToByte(row["saleType"]);
-
-            if (!Convert.IsDBNull(row["creationDate"]))
-                item.CreationDate = Convert.ToInt32(row["creationDate"]);
-
-            if (!Convert.IsDBNull(row["groupID"]))
-                item.GroupID = new UUID((string)row["groupID"]);
-
-            if (!Convert.IsDBNull(row["groupOwned"]))
-                item.GroupOwned = Convert.ToBoolean(row["groupOwned"]);
-
-            if (!Convert.IsDBNull(row["Flags"]))
-                item.Flags = Convert.ToUInt32(row["Flags"]);
-
-            return item;
-        }
-
-        /// <summary>
-        /// Fill a database row with item data
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="item"></param>
-        private static void fillItemRow(DataRow row, InventoryItemBase item)
-        {
-            row["UUID"] = item.ID.ToString();
-            row["assetID"] = item.AssetID.ToString();
-            row["assetType"] = item.AssetType;
-            row["invType"] = item.InvType;
-            row["parentFolderID"] = item.Folder.ToString();
-            row["avatarID"] = item.Owner.ToString();
-            row["creatorsID"] = item.CreatorIdentification.ToString();
-            row["inventoryName"] = item.Name;
-            row["inventoryDescription"] = item.Description;
-
-            row["inventoryNextPermissions"] = item.NextPermissions;
-            row["inventoryCurrentPermissions"] = item.CurrentPermissions;
-            row["inventoryBasePermissions"] = item.BasePermissions;
-            row["inventoryEveryOnePermissions"] = item.EveryOnePermissions;
-            row["inventoryGroupPermissions"] = item.GroupPermissions;
-
-            // new fields
-            row["salePrice"] = item.SalePrice;
-            row["saleType"] = item.SaleType;
-            row["creationDate"] = item.CreationDate;
-            row["groupID"] = item.GroupID.ToString();
-            row["groupOwned"] = item.GroupOwned;
-            row["flags"] = item.Flags;
-        }
-
-        /// <summary>
-        /// Add inventory folder
-        /// </summary>
-        /// <param name="folder">Folder base</param>
-        /// <param name="add">true=create folder. false=update existing folder</param>
-        /// <remarks>nasty</remarks>
-        private void addFolder(InventoryFolderBase folder, bool add)
-        {
-            lock (ds)
-            {
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-
-                DataRow inventoryRow = inventoryFolderTable.Rows.Find(folder.ID.ToString());
-                if (inventoryRow == null)
-                {
-                    if (! add)
-                        m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existent inventory folder: {0}", folder.ID);
-
-                    inventoryRow = inventoryFolderTable.NewRow();
-                    fillFolderRow(inventoryRow, folder);
-                    inventoryFolderTable.Rows.Add(inventoryRow);
-                }
-                else
-                {
-                    if (add)
-                        m_log.ErrorFormat("Interface Misuse: Attempting to Add inventory folder that already exists: {0}", folder.ID);
-
-                    fillFolderRow(inventoryRow, folder);
-                }
-
-                invFoldersDa.Update(ds, "inventoryfolders");
-            }
-        }
-
-        /// <summary>
-        /// Move an inventory folder
-        /// </summary>
-        /// <param name="folder">folder base</param>
-        private void moveFolder(InventoryFolderBase folder)
-        {
-            lock (ds)
-            {
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-
-                DataRow inventoryRow = inventoryFolderTable.Rows.Find(folder.ID.ToString());
-                if (inventoryRow == null)
-                {
-                    inventoryRow = inventoryFolderTable.NewRow();
-                    fillFolderRow(inventoryRow, folder);
-                    inventoryFolderTable.Rows.Add(inventoryRow);
-                }
-                else
-                {
-                    moveFolderRow(inventoryRow, folder);
-                }
-
-                invFoldersDa.Update(ds, "inventoryfolders");
-            }
-        }
-
-        /// <summary>
-        /// add an item in inventory
-        /// </summary>
-        /// <param name="item">the item</param>
-        /// <param name="add">true=add item ; false=update existing item</param>
-        private void addItem(InventoryItemBase item, bool add)
-        {
-            lock (ds)
-            {
-                DataTable inventoryItemTable = ds.Tables["inventoryitems"];
-
-                DataRow inventoryRow = inventoryItemTable.Rows.Find(item.ID.ToString());
-                if (inventoryRow == null)
-                {
-                    if (!add)
-                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existent inventory item: {0}", item.ID);
-
-                    inventoryRow = inventoryItemTable.NewRow();
-                    fillItemRow(inventoryRow, item);
-                    inventoryItemTable.Rows.Add(inventoryRow);
-                }
-                else
-                {
-                    if (add)
-                        m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Add inventory item that already exists: {0}", item.ID);
-
-                    fillItemRow(inventoryRow, item);
-                }
-
-                invItemsDa.Update(ds, "inventoryitems");
-
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-
-                inventoryRow = inventoryFolderTable.Rows.Find(item.Folder.ToString());
-                if (inventoryRow != null) //MySQL doesn't throw an exception here, so sqlite shouldn't either.
-                    inventoryRow["version"] = (int)inventoryRow["version"] + 1;
-
-                invFoldersDa.Update(ds, "inventoryfolders");
-            }
-        }
-
-        /// <summary>
-        /// TODO : DataSet commit
-        /// </summary>
-        public void Shutdown()
-        {
-            // TODO: DataSet commit
-        }
-
-        /// <summary>
-        /// The name of this DB provider
-        /// </summary>
-        /// <returns>Name of DB provider</returns>
-        public string Name
-        {
-            get { return "SQLite Inventory Data Interface"; }
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider version</returns>
-        public string Version
-        {
-            get
-            {
-                Module module = GetType().Module;
-                // string dllName = module.Assembly.ManifestModule.Name;
-                Version dllVersion = module.Assembly.GetName().Version;
-
-
-                return
-                    string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
-                            dllVersion.Revision);
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of inventory items contained within the specified folder
-        /// </summary>
-        /// <param name="folderID">The UUID of the target folder</param>
-        /// <returns>A List of InventoryItemBase items</returns>
-        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
-        {
-            lock (ds)
-            {
-                List<InventoryItemBase> retval = new List<InventoryItemBase>();
-                DataTable inventoryItemTable = ds.Tables["inventoryitems"];
-                string selectExp = "parentFolderID = '" + folderID + "'";
-                DataRow[] rows = inventoryItemTable.Select(selectExp);
-                foreach (DataRow row in rows)
-                {
-                    retval.Add(buildItem(row));
-                }
-
-                return retval;
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of the root folders within a users inventory
-        /// </summary>
-        /// <param name="user">The user whos inventory is to be searched</param>
-        /// <returns>A list of folder objects</returns>
-        public List<InventoryFolderBase> getUserRootFolders(UUID user)
-        {
-            return new List<InventoryFolderBase>();
-        }
-
-        // see InventoryItemBase.getUserRootFolder
-        public InventoryFolderBase getUserRootFolder(UUID user)
-        {
-            lock (ds)
-            {
-                List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-                string selectExp = "agentID = '" + user + "' AND parentID = '" + UUID.Zero + "'";
-                DataRow[] rows = inventoryFolderTable.Select(selectExp);
-                foreach (DataRow row in rows)
-                {
-                    folders.Add(buildFolder(row));
-                }
-
-                // There should only ever be one root folder for a user.  However, if there's more
-                // than one we'll simply use the first one rather than failing.  It would be even
-                // nicer to print some message to this effect, but this feels like it's too low a
-                // to put such a message out, and it's too minor right now to spare the time to
-                // suitably refactor.
-                if (folders.Count > 0)
-                {
-                    return folders[0];
-                }
-
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Append a list of all the child folders of a parent folder
-        /// </summary>
-        /// <param name="folders">list where folders will be appended</param>
-        /// <param name="parentID">ID of parent</param>
-        protected void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
-        {
-            lock (ds)
-            {
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-                string selectExp = "parentID = '" + parentID + "'";
-                DataRow[] rows = inventoryFolderTable.Select(selectExp);
-                foreach (DataRow row in rows)
-                {
-                    folders.Add(buildFolder(row));
-                }
-
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of inventory folders contained in the folder 'parentID'
-        /// </summary>
-        /// <param name="parentID">The folder to get subfolders for</param>
-        /// <returns>A list of inventory folders</returns>
-        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
-        {
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            getInventoryFolders(ref folders, parentID);
-            return folders;
-        }
-
-        /// <summary>
-        /// See IInventoryDataPlugin
-        /// </summary>
-        /// <param name="parentID"></param>
-        /// <returns></returns>
-        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
-        {
-            /* Note: There are subtle changes between this implementation of getFolderHierarchy and the previous one
-                 * - We will only need to hit the database twice instead of n times.
-                 * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned
-                 *   by the same person, each user only has 1 inventory heirarchy
-                 * - The returned list is not ordered, instead of breadth-first ordered
-               There are basically 2 usage cases for getFolderHeirarchy:
-                 1) Getting the user's entire inventory heirarchy when they log in
-                 2) Finding a subfolder heirarchy to delete when emptying the trash.
-               This implementation will pull all inventory folders from the database, and then prune away any folder that
-               is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the
-               database than to make n requests. This pays off only if requested heirarchy is large.
-               By making this choice, we are making the worst case better at the cost of making the best case worse
-                 - Francis
-             */
-
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-            DataRow[] folderRows = null, parentRow;
-            InventoryFolderBase parentFolder = null;
-            lock (ds)
-            {
-                /* Fetch the parent folder from the database to determine the agent ID.
-                 * Then fetch all inventory folders for that agent from the agent ID.
-                 */
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-                string selectExp = "UUID = '" + parentID + "'";
-                parentRow = inventoryFolderTable.Select(selectExp); // Assume at most 1 result
-                if (parentRow.GetLength(0) >= 1)                    // No result means parent folder does not exist
-                {
-                    parentFolder = buildFolder(parentRow[0]);
-                    UUID agentID = parentFolder.Owner;
-                    selectExp = "agentID = '" + agentID + "'";
-                    folderRows = inventoryFolderTable.Select(selectExp);
-                }
-
-                if (folderRows != null && folderRows.GetLength(0) >= 1)   // No result means parent folder does not exist
-                {                                                       // or has no children
-                    /* if we're querying the root folder, just return an unordered list of all folders in the user's
-                     * inventory
-                     */
-                    if (parentFolder.ParentID == UUID.Zero)
-                    {
-                        foreach (DataRow row in folderRows)
-                        {
-                            InventoryFolderBase curFolder = buildFolder(row);
-                            if (curFolder.ID != parentID)   // Return all folders except the parent folder of heirarchy
-                                folders.Add(buildFolder(row));
-                        }
-                    } // If requesting root folder
-                    /* else we are querying a non-root folder. We currently have a list of all of the user's folders,
-                     * we must construct a list of all folders in the heirarchy below parentID.
-                     * Our first step will be to construct a hash table of all folders, indexed by parent ID.
-                     * Once we have constructed the hash table, we will do a breadth-first traversal on the tree using the
-                     * hash table to find child folders.
-                     */
-                    else
-                    {                                                         // Querying a non-root folder
-
-                        // Build a hash table of all user's inventory folders, indexed by each folder's parent ID
-                        Dictionary<UUID, List<InventoryFolderBase>> hashtable =
-                            new Dictionary<UUID, List<InventoryFolderBase>>(folderRows.GetLength(0));
-
-                        foreach (DataRow row in folderRows)
-                        {
-                            InventoryFolderBase curFolder = buildFolder(row);
-                            if (curFolder.ParentID != UUID.Zero) // Discard root of tree - not needed
-                            {
-                                if (hashtable.ContainsKey(curFolder.ParentID))
-                                {
-                                    // Current folder already has a sibling - append to sibling list
-                                    hashtable[curFolder.ParentID].Add(curFolder);
-                                }
-                                else
-                                {
-                                    List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
-                                    siblingList.Add(curFolder);
-                                    // Current folder has no known (yet) siblings
-                                    hashtable.Add(curFolder.ParentID, siblingList);
-                                }
-                            }
-                        } // For all inventory folders
-
-                        // Note: Could release the ds lock here - we don't access folderRows or the database anymore.
-                        // This is somewhat of a moot point as the callers of this function usually lock db anyways.
-
-                        if (hashtable.ContainsKey(parentID)) // if requested folder does have children
-                            folders.AddRange(hashtable[parentID]);
-
-                        // BreadthFirstSearch build inventory tree **Note: folders.Count is *not* static
-                        for (int i = 0; i < folders.Count; i++)
-                            if (hashtable.ContainsKey(folders[i].ID))
-                                folders.AddRange(hashtable[folders[i].ID]);
-
-                    } // if requesting a subfolder heirarchy
-                } // if folder parentID exists and has children
-            } // lock ds
-            return folders;
-        }
-
-        /// <summary>
-        /// Returns an inventory item by its UUID
-        /// </summary>
-        /// <param name="item">The UUID of the item to be returned</param>
-        /// <returns>A class containing item information</returns>
-        public InventoryItemBase getInventoryItem(UUID item)
-        {
-            lock (ds)
-            {
-                DataRow row = ds.Tables["inventoryitems"].Rows.Find(item.ToString());
-                if (row != null)
-                {
-                    return buildItem(row);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a specified inventory folder by its UUID
-        /// </summary>
-        /// <param name="folder">The UUID of the folder to be returned</param>
-        /// <returns>A class containing folder information</returns>
-        public InventoryFolderBase getInventoryFolder(UUID folder)
-        {
-            // TODO: Deep voodoo here.  If you enable this code then
-            // multi region breaks.  No idea why, but I figured it was
-            // better to leave multi region at this point.  It does mean
-            // that you don't get to see system textures why creating
-            // clothes and the like. :(
-            lock (ds)
-            {
-                DataRow row = ds.Tables["inventoryfolders"].Rows.Find(folder.ToString());
-                if (row != null)
-                {
-                    return buildFolder(row);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a new inventory item based on item
-        /// </summary>
-        /// <param name="item">The item to be created</param>
-        public void addInventoryItem(InventoryItemBase item)
-        {
-            addItem(item, true);
-        }
-
-        /// <summary>
-        /// Updates an inventory item with item (updates based on ID)
-        /// </summary>
-        /// <param name="item">The updated item</param>
-        public void updateInventoryItem(InventoryItemBase item)
-        {
-            addItem(item, false);
-        }
-
-        /// <summary>
-        /// Delete an inventory item
-        /// </summary>
-        /// <param name="item">The item UUID</param>
-        public void deleteInventoryItem(UUID itemID)
-        {
-            lock (ds)
-            {
-                DataTable inventoryItemTable = ds.Tables["inventoryitems"];
-
-                DataRow inventoryRow = inventoryItemTable.Rows.Find(itemID.ToString());
-                if (inventoryRow != null)
-                {
-                    inventoryRow.Delete();
-                }
-
-                invItemsDa.Update(ds, "inventoryitems");
-            }
-        }
-
-        public InventoryItemBase queryInventoryItem(UUID itemID)
-        {
-            return getInventoryItem(itemID);
-        }
-
-        public InventoryFolderBase queryInventoryFolder(UUID folderID)
-        {
-            return getInventoryFolder(folderID);
-        }
-
-        /// <summary>
-        /// Delete all items in the specified folder
-        /// </summary>
-        /// <param name="folderId">id of the folder, whose item content should be deleted</param>
-        /// <todo>this is horribly inefficient, but I don't want to ruin the overall structure of this implementation</todo>
-        private void deleteItemsInFolder(UUID folderId)
-        {
-            List<InventoryItemBase> items = getInventoryInFolder(folderId);
-
-            foreach (InventoryItemBase i in items)
-                deleteInventoryItem(i.ID);
-        }
-
-        /// <summary>
-        /// Adds a new folder specified by folder
-        /// </summary>
-        /// <param name="folder">The inventory folder</param>
-        public void addInventoryFolder(InventoryFolderBase folder)
-        {
-            addFolder(folder, true);
-        }
-
-        /// <summary>
-        /// Updates a folder based on its ID with folder
-        /// </summary>
-        /// <param name="folder">The inventory folder</param>
-        public void updateInventoryFolder(InventoryFolderBase folder)
-        {
-            addFolder(folder, false);
-        }
-
-        /// <summary>
-        /// Moves a folder based on its ID with folder
-        /// </summary>
-        /// <param name="folder">The inventory folder</param>
-        public void moveInventoryFolder(InventoryFolderBase folder)
-        {
-            moveFolder(folder);
-        }
-
-        /// <summary>
-        /// Delete a folder
-        /// </summary>
-        /// <remarks>
-        /// This will clean-up any child folders and child items as well
-        /// </remarks>
-        /// <param name="folderID">the folder UUID</param>
-        public void deleteInventoryFolder(UUID folderID)
-        {
-            lock (ds)
-            {
-                List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
-
-                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-                DataRow inventoryRow;
-
-                //Delete all sub-folders
-                foreach (InventoryFolderBase f in subFolders)
-                {
-                    inventoryRow = inventoryFolderTable.Rows.Find(f.ID.ToString());
-                    if (inventoryRow != null)
-                    {
-                        deleteItemsInFolder(f.ID);
-                        inventoryRow.Delete();
-                    }
-                }
-
-                //Delete the actual row
-                inventoryRow = inventoryFolderTable.Rows.Find(folderID.ToString());
-                if (inventoryRow != null)
-                {
-                    deleteItemsInFolder(folderID);
-                    inventoryRow.Delete();
-                }
-
-                invFoldersDa.Update(ds, "inventoryfolders");
-            }
-        }
-
-        /***********************************************************************
-         *
-         *  Data Table definitions
-         *
-         **********************************************************************/
-
-        protected void CreateDataSetMapping(IDataAdapter da, string tableName)
-        {
-            ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
-            foreach (DataColumn col in ds.Tables[tableName].Columns)
-            {
-                dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
-            }
-        }
-
-        /// <summary>
-        /// Create the "inventoryitems" table
-        /// </summary>
-        private static DataTable createInventoryItemsTable()
-        {
-            DataTable inv = new DataTable("inventoryitems");
-
-            createCol(inv, "UUID", typeof (String)); //inventoryID
-            createCol(inv, "assetID", typeof (String));
-            createCol(inv, "assetType", typeof (Int32));
-            createCol(inv, "invType", typeof (Int32));
-            createCol(inv, "parentFolderID", typeof (String));
-            createCol(inv, "avatarID", typeof (String));
-            createCol(inv, "creatorsID", typeof (String));
-
-            createCol(inv, "inventoryName", typeof (String));
-            createCol(inv, "inventoryDescription", typeof (String));
-            // permissions
-            createCol(inv, "inventoryNextPermissions", typeof (Int32));
-            createCol(inv, "inventoryCurrentPermissions", typeof (Int32));
-            createCol(inv, "inventoryBasePermissions", typeof (Int32));
-            createCol(inv, "inventoryEveryOnePermissions", typeof (Int32));
-            createCol(inv, "inventoryGroupPermissions", typeof (Int32));
-
-            // sale info
-            createCol(inv, "salePrice", typeof(Int32));
-            createCol(inv, "saleType", typeof(Byte));
-
-            // creation date
-            createCol(inv, "creationDate", typeof(Int32));
-
-            // group info
-            createCol(inv, "groupID", typeof(String));
-            createCol(inv, "groupOwned", typeof(Boolean));
-
-            // Flags
-            createCol(inv, "flags", typeof(UInt32));
-
-            inv.PrimaryKey = new DataColumn[] { inv.Columns["UUID"] };
-            return inv;
-        }
-
-        /// <summary>
-        /// Creates the "inventoryfolders" table
-        /// </summary>
-        /// <returns></returns>
-        private static DataTable createInventoryFoldersTable()
-        {
-            DataTable fol = new DataTable("inventoryfolders");
-
-            createCol(fol, "UUID", typeof (String)); //folderID
-            createCol(fol, "name", typeof (String));
-            createCol(fol, "agentID", typeof (String));
-            createCol(fol, "parentID", typeof (String));
-            createCol(fol, "type", typeof (Int32));
-            createCol(fol, "version", typeof (Int32));
-
-            fol.PrimaryKey = new DataColumn[] {fol.Columns["UUID"]};
-            return fol;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="da"></param>
-        /// <param name="conn"></param>
-        private void setupItemsCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            lock (ds)
-            {
-                da.InsertCommand = createInsertCommand("inventoryitems", ds.Tables["inventoryitems"]);
-                da.InsertCommand.Connection = conn;
-
-                da.UpdateCommand = createUpdateCommand("inventoryitems", "UUID=:UUID", ds.Tables["inventoryitems"]);
-                da.UpdateCommand.Connection = conn;
-
-                SqliteCommand delete = new SqliteCommand("delete from inventoryitems where UUID = :UUID");
-                delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
-                delete.Connection = conn;
-                da.DeleteCommand = delete;
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="da"></param>
-        /// <param name="conn"></param>
-        private void setupFoldersCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            lock (ds)
-            {
-                da.InsertCommand = createInsertCommand("inventoryfolders", ds.Tables["inventoryfolders"]);
-                da.InsertCommand.Connection = conn;
-
-                da.UpdateCommand = createUpdateCommand("inventoryfolders", "UUID=:UUID", ds.Tables["inventoryfolders"]);
-                da.UpdateCommand.Connection = conn;
-
-                SqliteCommand delete = new SqliteCommand("delete from inventoryfolders where UUID = :UUID");
-                delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
-                delete.Connection = conn;
-                da.DeleteCommand = delete;
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private static InventoryFolderBase buildFolder(DataRow row)
-        {
-            InventoryFolderBase folder = new InventoryFolderBase();
-            folder.ID = new UUID((string) row["UUID"]);
-            folder.Name = (string) row["name"];
-            folder.Owner = new UUID((string) row["agentID"]);
-            folder.ParentID = new UUID((string) row["parentID"]);
-            folder.Type = Convert.ToInt16(row["type"]);
-            folder.Version = Convert.ToUInt16(row["version"]);
-            return folder;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="folder"></param>
-        private static void fillFolderRow(DataRow row, InventoryFolderBase folder)
-        {
-            row["UUID"] = folder.ID.ToString();
-            row["name"] = folder.Name;
-            row["agentID"] = folder.Owner.ToString();
-            row["parentID"] = folder.ParentID.ToString();
-            row["type"] = folder.Type;
-            row["version"] = folder.Version;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="folder"></param>
-        private static void moveFolderRow(DataRow row, InventoryFolderBase folder)
-        {
-            row["UUID"] = folder.ID.ToString();
-            row["parentID"] = folder.ParentID.ToString();
-        }
-
-        public List<InventoryItemBase> fetchActiveGestures (UUID avatarID)
-        {
-            lock (ds)
-            {
-                List<InventoryItemBase> items = new List<InventoryItemBase>();
-
-                DataTable inventoryItemTable = ds.Tables["inventoryitems"];
-                string selectExp 
-                    = "avatarID = '" + avatarID + "' AND assetType = " + (int)AssetType.Gesture + " AND flags = 1";
-                //m_log.DebugFormat("[SQL]: sql = " + selectExp);
-                DataRow[] rows = inventoryItemTable.Select(selectExp);
-                foreach (DataRow row in rows)
-                {
-                    items.Add(buildItem(row));
-                }
-                return items;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 6ed3d40..19880de 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -707,7 +707,7 @@ namespace OpenSim.Data.SQLite
                 DataRow[] primsForRegion = prims.Select(byRegion);
 //                m_log.Info("[SQLITE REGION DB]: Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
 
-                // First, create all groups 
+                // First, create all groups
                 foreach (DataRow primRow in primsForRegion)
                 {
                     try
@@ -733,12 +733,12 @@ namespace OpenSim.Data.SQLite
                             }
 
                             SceneObjectGroup group = new SceneObjectGroup(prim);
-                            
+
                             createdObjects.Add(group.UUID, group);
                             retvals.Add(group);
                             LoadItems(prim);
 
-                           
+
                         }
                     }
                     catch (Exception e)
@@ -827,7 +827,7 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// Store a terrain revision in region storage
+        /// Store a terrain in region storage
         /// </summary>
         /// <param name="ter">terrain heightfield</param>
         /// <param name="regionID">region UUID</param>
@@ -851,7 +851,44 @@ namespace OpenSim.Data.SQLite
                 Array terrainDBblob;
                 terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
 
-                m_log.DebugFormat("{0} Storing terrain revision r {1}", LogHeader, terrainDBRevision);
+                m_log.DebugFormat("{0} Storing terrain format {1}", LogHeader, terrainDBRevision);
+
+                using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
+                {
+                    cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
+                    cmd.Parameters.Add(new SqliteParameter(":Revision", terrainDBRevision));
+                    cmd.Parameters.Add(new SqliteParameter(":Heightfield", terrainDBblob));
+                    cmd.ExecuteNonQuery();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Store baked terrain in region storage
+        /// </summary>
+        /// <param name="ter">terrain heightfield</param>
+        /// <param name="regionID">region UUID</param>
+        public void StoreBakedTerrain(TerrainData terrData, UUID regionID)
+        {
+            lock (ds)
+            {
+                using (
+                    SqliteCommand cmd = new SqliteCommand("delete from bakedterrain where RegionUUID=:RegionUUID", m_conn))
+                {
+                    cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
+                    cmd.ExecuteNonQuery();
+                }
+
+                // the following is an work around for .NET.  The perf
+                // issues associated with it aren't as bad as you think.
+                String sql = "insert into bakedterrain(RegionUUID, Revision, Heightfield)" +
+                             " values(:RegionUUID, :Revision, :Heightfield)";
+
+                int terrainDBRevision;
+                Array terrainDBblob;
+                terrData.GetDatabaseBlob(out terrainDBRevision, out terrainDBblob);
+
+                m_log.DebugFormat("{0} Storing bakedterrain format {1}", LogHeader, terrainDBRevision);
 
                 using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
                 {
@@ -913,6 +950,34 @@ namespace OpenSim.Data.SQLite
             return terrData;
         }
 
+        public TerrainData LoadBakedTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
+        {
+            TerrainData terrData = null;
+
+            lock (ds)
+            {
+                String sql = "select RegionUUID, Revision, Heightfield from bakedterrain" +
+                             " where RegionUUID=:RegionUUID";
+
+                using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
+                {
+                    cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
+
+                    using (IDataReader row = cmd.ExecuteReader())
+                    {
+                        int rev = 0;
+                        if (row.Read())
+                        {
+                            rev = Convert.ToInt32(row["Revision"]);
+                            byte[] blob = (byte[])row["Heightfield"];
+                            terrData = TerrainData.CreateFromDatabaseBlobFactory(pSizeX, pSizeY, pSizeZ, rev, blob);
+                        }
+                    }
+                }
+            }
+            return terrData;
+        }
+
         public void RemoveLandObject(UUID globalID)
         {
             lock (ds)
@@ -1151,6 +1216,7 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "OwnerID", typeof(String));
             createCol(prims, "GroupID", typeof(String));
             createCol(prims, "LastOwnerID", typeof(String));
+            createCol(prims, "RezzerID", typeof(String));
             createCol(prims, "OwnerMask", typeof(Int32));
             createCol(prims, "NextOwnerMask", typeof(Int32));
             createCol(prims, "GroupMask", typeof(Int32));
@@ -1232,7 +1298,7 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "VolumeDetect", typeof(Int16));
 
             createCol(prims, "MediaURL", typeof(String));
-            
+
             createCol(prims, "AttachedPosX", typeof(Double));
             createCol(prims, "AttachedPosY", typeof(Double));
             createCol(prims, "AttachedPosZ", typeof(Double));
@@ -1246,6 +1312,7 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "Restitution", typeof(Double));
 
             createCol(prims, "KeyframeMotion", typeof(Byte[]));
+
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
 
@@ -1353,7 +1420,7 @@ namespace OpenSim.Data.SQLite
             createCol(land, "Name", typeof(String));
             createCol(land, "Desc", typeof(String));
             createCol(land, "OwnerUUID", typeof(String));
-            createCol(land, "IsGroupOwned", typeof(Boolean));
+            createCol(land, "IsGroupOwned", typeof(string));
             createCol(land, "Area", typeof(Int32));
             createCol(land, "AuctionID", typeof(Int32)); //Unemplemented
             createCol(land, "Category", typeof(Int32)); //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -1386,6 +1453,9 @@ namespace OpenSim.Data.SQLite
             createCol(land, "MediaLoop", typeof(Boolean));
             createCol(land, "ObscureMedia", typeof(Boolean));
             createCol(land, "ObscureMusic", typeof(Boolean));
+            createCol(land, "SeeAVs", typeof(Boolean));
+            createCol(land, "AnyAVSounds", typeof(Boolean));
+            createCol(land, "GroupAVSounds", typeof(Boolean));
 
             land.PrimaryKey = new DataColumn[] { land.Columns["UUID"] };
 
@@ -1610,6 +1680,7 @@ namespace OpenSim.Data.SQLite
             prim.OwnerID = new UUID((String)row["OwnerID"]);
             prim.GroupID = new UUID((String)row["GroupID"]);
             prim.LastOwnerID = new UUID((String)row["LastOwnerID"]);
+            prim.RezzerID = row["RezzerID"] == DBNull.Value ? UUID.Zero : new UUID((String)row["RezzerID"]);
             prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]);
             prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]);
             prim.GroupMask = Convert.ToUInt32(row["GroupMask"]);
@@ -1724,7 +1795,7 @@ namespace OpenSim.Data.SQLite
 //                m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
                 prim.MediaUrl = (string)row["MediaURL"];
             }
-            
+
             prim.AttachedPos = new Vector3(
                 Convert.ToSingle(row["AttachedPosX"]),
                 Convert.ToSingle(row["AttachedPosY"]),
@@ -1735,7 +1806,7 @@ namespace OpenSim.Data.SQLite
             {
                 //m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
                 prim.DynAttrs = DAMap.FromXml((string)row["DynAttrs"]);
-            }   
+            }
             else
             {
                 prim.DynAttrs = new DAMap();
@@ -1747,7 +1818,7 @@ namespace OpenSim.Data.SQLite
             prim.Friction = Convert.ToSingle(row["Friction"]);
             prim.Restitution = Convert.ToSingle(row["Restitution"]);
 
-            
+
             if (!(row["KeyframeMotion"] is DBNull))
             {
                 Byte[] data = (byte[])row["KeyframeMotion"];
@@ -1760,7 +1831,24 @@ namespace OpenSim.Data.SQLite
             {
                 prim.KeyframeMotion = null;
             }
-            
+
+            prim.PassCollisions = Convert.ToBoolean(row["PassCollisions"]);
+            prim.PassTouches = Convert.ToBoolean(row["PassTouches"]);
+            prim.RotationAxisLocks = Convert.ToByte(row["RotationAxisLocks"]);
+
+            SOPVehicle vehicle = null;
+            if (!(row["Vehicle"] is DBNull) && row["Vehicle"].ToString() != String.Empty)
+            {
+                vehicle = SOPVehicle.FromXml2(row["Vehicle"].ToString());
+                if (vehicle != null)
+                    prim.VehicleParams = vehicle;
+            }
+
+            PhysicsInertiaData pdata = null;
+            if (!(row["PhysInertia"] is DBNull) && row["PhysInertia"].ToString() != String.Empty)
+                pdata = PhysicsInertiaData.FromXml2(row["PhysInertia"].ToString());
+            prim.PhysicsInertia = pdata;
+
             return prim;
         }
 
@@ -1817,7 +1905,7 @@ namespace OpenSim.Data.SQLite
             newData.Name = (String)row["Name"];
             newData.Description = (String)row["Desc"];
             newData.OwnerID = (UUID)(String)row["OwnerUUID"];
-            newData.IsGroupOwned = (Boolean)row["IsGroupOwned"];
+            newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
             newData.Area = Convert.ToInt32(row["Area"]);
             newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
             newData.Category = (ParcelCategory)Convert.ToInt32(row["Category"]);
@@ -1845,6 +1933,10 @@ namespace OpenSim.Data.SQLite
             newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
             newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
             newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
+            newData.SeeAVs = Convert.ToBoolean(row["SeeAVs"]);
+            newData.AnyAVSounds = Convert.ToBoolean(row["AnyAVSounds"]);
+            newData.GroupAVSounds = Convert.ToBoolean(row["GroupAVSounds"]);
+
             try
             {
                 newData.UserLocation =
@@ -1918,7 +2010,8 @@ namespace OpenSim.Data.SQLite
             newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
             newSettings.TelehubObject = new UUID((String)row["TelehubObject"]);
             newSettings.ParcelImageID = new UUID((String)row["parcel_tile_ID"]);
-
+            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
+            newSettings.Casino = Convert.ToBoolean(row["casino"]);
             return newSettings;
         }
 
@@ -2013,6 +2106,7 @@ namespace OpenSim.Data.SQLite
             return entry;
         }
 
+
         /// <summary>
         ///
         /// </summary>
@@ -2039,6 +2133,7 @@ namespace OpenSim.Data.SQLite
             row["OwnerID"] = prim.OwnerID.ToString();
             row["GroupID"] = prim.GroupID.ToString();
             row["LastOwnerID"] = prim.LastOwnerID.ToString();
+            row["RezzerID"] = prim.RezzerID.ToString();
             row["OwnerMask"] = prim.OwnerMask;
             row["NextOwnerMask"] = prim.NextOwnerMask;
             row["GroupMask"] = prim.GroupMask;
@@ -2137,7 +2232,6 @@ namespace OpenSim.Data.SQLite
             // click action
             row["ClickAction"] = prim.ClickAction;
 
-            row["SalePrice"] = prim.SalePrice;
             row["Material"] = prim.Material;
 
             row["CollisionSound"] = prim.CollisionSound.ToString();
@@ -2168,8 +2262,21 @@ namespace OpenSim.Data.SQLite
                 row["KeyframeMotion"] = prim.KeyframeMotion.Serialize();
             else
                 row["KeyframeMotion"] = new Byte[0];
-            
-            
+
+            row["PassTouches"] = prim.PassTouches;
+            row["PassCollisions"] = prim.PassCollisions;
+            row["RotationAxisLocks"] = prim.RotationAxisLocks;
+
+            if (prim.VehicleParams != null)
+                row["Vehicle"] = prim.VehicleParams.ToXml2();
+            else
+                row["Vehicle"] = String.Empty;
+
+            if (prim.PhysicsInertia != null)
+                row["PhysInertia"] = prim.PhysicsInertia.ToXml2();
+            else
+                row["PhysInertia"] = String.Empty;
+
         }
 
         /// <summary>
@@ -2220,7 +2327,7 @@ namespace OpenSim.Data.SQLite
             row["Name"] = land.Name;
             row["Desc"] = land.Description;
             row["OwnerUUID"] = land.OwnerID.ToString();
-            row["IsGroupOwned"] = land.IsGroupOwned;
+            row["IsGroupOwned"] = land.IsGroupOwned.ToString();
             row["Area"] = land.Area;
             row["AuctionID"] = land.AuctionID; //Unemplemented
             row["Category"] = land.Category; //Enum OpenMetaverse.Parcel.ParcelCategory
@@ -2253,6 +2360,10 @@ namespace OpenSim.Data.SQLite
             row["MediaLoop"] = land.MediaLoop;
             row["ObscureMusic"] = land.ObscureMusic;
             row["ObscureMedia"] = land.ObscureMedia;
+            row["SeeAVs"] = land.SeeAVs;
+            row["AnyAVSounds"] = land.AnyAVSounds;
+            row["GroupAVSounds"] = land.GroupAVSounds;
+
         }
 
         /// <summary>
@@ -2311,6 +2422,8 @@ namespace OpenSim.Data.SQLite
             row["map_tile_ID"] = settings.TerrainImageID.ToString();
             row["TelehubObject"] = settings.TelehubObject.ToString();
             row["parcel_tile_ID"] = settings.ParcelImageID.ToString();
+            row["block_search"] = settings.GodBlockSearch;
+            row["casino"] = settings.Casino;
         }
 
         /// <summary>
@@ -2430,7 +2543,7 @@ namespace OpenSim.Data.SQLite
 
             if (!(row["Media"] is System.DBNull))
                 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
-                        
+
             return s;
         }
 
@@ -2908,6 +3021,10 @@ namespace OpenSim.Data.SQLite
             {
                 return DbType.Binary;
             }
+            else if (type == typeof(Boolean))
+            {
+                return DbType.Boolean;
+            }
             else
             {
                 return DbType.String;
@@ -2944,6 +3061,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index f98d376..1b79185 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -75,12 +75,17 @@ namespace OpenSim.Data.SQLite
                 }
                 else
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')",
                         m_Realm, scopeID.ToString(), words[0], words[1]);
                 }
 
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index cd3e8b6..13aac79 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -46,43 +46,43 @@ namespace OpenSim.Data.SQLite
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private SqliteConnection m_connection;
         private string m_connectionString;
-        
+
         private Dictionary<string, FieldInfo> m_FieldMap =
             new Dictionary<string, FieldInfo>();
-        
+
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
-        
+
         public SQLiteUserProfilesData()
         {
         }
-        
+
         public SQLiteUserProfilesData(string connectionString)
         {
             Initialise(connectionString);
         }
-        
+
         public void Initialise(string connectionString)
         {
             if (Util.IsWindows())
                 Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-            
+
             m_connectionString = connectionString;
-            
+
             m_log.Info("[PROFILES_DATA]: Sqlite - connecting: "+m_connectionString);
-            
+
             m_connection = new SqliteConnection(m_connectionString);
             m_connection.Open();
-            
+
             Migration m = new Migration(m_connection, Assembly, "UserProfiles");
             m.Update();
         }
-        
+
         private string[] FieldList
         {
             get { return new List<string>(m_FieldMap.Keys).ToArray(); }
@@ -123,7 +123,7 @@ namespace OpenSim.Data.SQLite
             }
 
             reader.Close();
-            
+
             return data;
         }
         public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
@@ -162,21 +162,21 @@ namespace OpenSim.Data.SQLite
             query += ":ParcelName,";
             query += ":Flags,";
             query += ":ListingPrice ) ";
-            
+
             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);
@@ -211,7 +211,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":ParcelName", ad.ParcelName.ToString());
                     cmd.Parameters.AddWithValue(":Flags", ad.Flags.ToString());
                     cmd.Parameters.AddWithValue(":ListingPrice", ad.Price.ToString ());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -227,17 +227,17 @@ namespace OpenSim.Data.SQLite
         public bool DeleteClassifiedRecord(UUID recordId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM classifieds WHERE ";
             query += "classifieduuid = :ClasifiedId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":ClassifiedId", recordId.ToString());
- 
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -254,17 +254,17 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM classifieds WHERE ";
             query += "classifieduuid = :AdId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":AdId", ad.ClassifiedId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
                         if(reader.Read ())
@@ -299,24 +299,24 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
             query += "creatoruuid = :Id";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
                         while (reader.Read())
                         {
                             OSDMap record = new OSDMap();
-                            
+
                             record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
                             record.Add("name",OSD.FromString((string)reader["name"]));
                             data.Add(record);
@@ -336,11 +336,11 @@ namespace OpenSim.Data.SQLite
             IDataReader reader = null;
             string query = string.Empty;
             UserProfilePick pick = new UserProfilePick();
-            
+
             query += "SELECT * FROM userpicks WHERE ";
             query += "creatoruuid = :CreatorId AND ";
             query += "pickuuid =  :PickId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -348,17 +348,17 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":CreatorId", avatarId.ToString());
                     cmd.Parameters.AddWithValue(":PickId", pickId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader())
                     {
-                        
+
                         while (reader.Read())
                         {
                             string description = (string)reader["description"];
-                            
+
                             if (string.IsNullOrEmpty(description))
                                 description = "No description given.";
-                            
+
                             UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
                             UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
                             UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
@@ -385,7 +385,7 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdatePicksRecord(UserProfilePick pick)
-        {      
+        {
             string query = string.Empty;
 
             query += "INSERT OR REPLACE INTO userpicks (";
@@ -416,7 +416,7 @@ namespace OpenSim.Data.SQLite
             query += ":GlobalPos,";
             query += ":SortOrder,";
             query += ":Enabled) ";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -456,10 +456,10 @@ namespace OpenSim.Data.SQLite
         public bool DeletePicksRecord(UUID pickId)
         {
             string query = string.Empty;
-            
+
             query += "DELETE FROM userpicks WHERE ";
             query += "pickuuid = :PickId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -479,15 +479,15 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool GetAvatarNotes(ref UserProfileNotes notes)
-        {  
+        {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT `notes` FROM usernotes WHERE ";
             query += "useruuid = :Id AND ";
             query += "targetuuid = :TargetId";
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -495,7 +495,7 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", notes.UserId.ToString());
                     cmd.Parameters.AddWithValue(":TargetId", notes.TargetId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         while (reader.Read())
@@ -514,10 +514,10 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
-        {          
+        {
             string query = string.Empty;
             bool remove;
-            
+
             if(string.IsNullOrEmpty(note.Notes))
             {
                 remove = true;
@@ -533,7 +533,7 @@ namespace OpenSim.Data.SQLite
                 query += ":TargetId,";
                 query += ":Notes )";
             }
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -544,7 +544,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.AddWithValue(":Notes", note.Notes);
                     cmd.Parameters.AddWithValue(":TargetId", note.TargetId.ToString ());
                     cmd.Parameters.AddWithValue(":UserId", note.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -561,7 +561,7 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM userprofile WHERE ";
             query += "useruuid = :Id";
 
@@ -569,7 +569,7 @@ namespace OpenSim.Data.SQLite
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
-                    
+
 
                     try
                     {
@@ -611,7 +611,7 @@ namespace OpenSim.Data.SQLite
                             props.Language = string.Empty;
                             props.PublishProfile = false;
                             props.PublishMature = false;
-                            
+
                             query = "INSERT INTO userprofile (";
                             query += "useruuid, ";
                             query += "profilePartner, ";
@@ -659,7 +659,7 @@ namespace OpenSim.Data.SQLite
                                 put.Parameters.AddWithValue(":profileAboutText", props.AboutText);
                                 put.Parameters.AddWithValue(":profileFirstImage", props.FirstLifeImageId.ToString());
                                 put.Parameters.AddWithValue(":profileFirstText", props.FirstLifeText);
-                                
+
                                 put.ExecuteNonQuery();
                             }
                         }
@@ -668,9 +668,9 @@ namespace OpenSim.Data.SQLite
         }
 
         public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
-        {           
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileURL=:profileURL, ";
             query += "profileImage=:image, ";
@@ -678,7 +678,7 @@ namespace OpenSim.Data.SQLite
             query += "profileFirstImage=:firstlifeimage,";
             query += "profileFirstText=:firstlifetext ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -690,7 +690,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":firstlifeimage", props.FirstLifeImageId.ToString());
                     cmd.Parameters.AddWithValue(":firstlifetext", props.FirstLifeText);
                     cmd.Parameters.AddWithValue(":uuid", props.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -698,16 +698,16 @@ namespace OpenSim.Data.SQLite
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
                                   ": AgentPropertiesUpdate exception {0}", e.Message);
-                
+
                 return false;
             }
             return true;
         }
 
         public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
-        {         
+        {
             string query = string.Empty;
-            
+
             query += "UPDATE userprofile SET ";
             query += "profileWantToMask=:WantMask, ";
             query += "profileWantToText=:WantText,";
@@ -715,7 +715,7 @@ namespace OpenSim.Data.SQLite
             query += "profileSkillsText=:SkillsText, ";
             query += "profileLanguages=:Languages ";
             query += "WHERE useruuid=:uuid";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -727,7 +727,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":SkillsText", up.SkillsText);
                     cmd.Parameters.AddWithValue(":Languages", up.Language);
                     cmd.Parameters.AddWithValue(":uuid", up.UserId.ToString());
-                    
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -741,16 +741,17 @@ namespace OpenSim.Data.SQLite
             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 (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -760,7 +761,7 @@ namespace OpenSim.Data.SQLite
                     cmd.Parameters.AddWithValue(":Visible", pref.Visible);
                     cmd.Parameters.AddWithValue(":EMail", pref.EMail);
                     cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
-                        
+
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -778,20 +779,20 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT imviaemail,visible,email FROM ";
             query += "usersettings WHERE ";
             query += "useruuid = :Id";
-            
+
             OSDArray data = new OSDArray();
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
-                        
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -804,13 +805,13 @@ namespace OpenSim.Data.SQLite
                          {
                             query = "INSERT INTO usersettings VALUES ";
                             query += "(:Id,'false','false', :Email)";
-                            
+
                             using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
                             {
                                 put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
                                 put.Parameters.AddWithValue(":Email", pref.EMail);
                                 put.ExecuteNonQuery();
-                                    
+
                             }
                         }
                     }
@@ -830,11 +831,11 @@ namespace OpenSim.Data.SQLite
         {
             IDataReader reader = null;
             string query = string.Empty;
-            
+
             query += "SELECT * FROM `userdata` WHERE ";
             query += "UserId = :Id AND ";
             query += "TagId = :TagId";
-            
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -842,7 +843,7 @@ namespace OpenSim.Data.SQLite
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
                     cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -857,7 +858,7 @@ namespace OpenSim.Data.SQLite
                             query += ":TagId,";
                             query += ":DataKey,";
                             query +=  ":DataVal) ";
-                            
+
                             using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
                             {
                                 put.Parameters.AddWithValue(":Id", props.UserId.ToString());
@@ -881,16 +882,16 @@ namespace OpenSim.Data.SQLite
             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 (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
@@ -917,17 +918,17 @@ namespace OpenSim.Data.SQLite
             IDataReader reader = null;
             OSDArray data = new OSDArray();
             string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = :Id";
-            
+
             // Get classified image assets
-            
-            
+
+
             try
             {
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         while(reader.Read())
@@ -941,7 +942,7 @@ namespace OpenSim.Data.SQLite
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
@@ -950,14 +951,14 @@ namespace OpenSim.Data.SQLite
                         }
                     }
                 }
-                    
+
                 query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = :Id";
-                
+
                 using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
                 {
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
-                    
+
                     using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                     {
                         if(reader.Read())
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index ca5861f..1218ebb 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.SQLite
          **********************************************************************/
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="dt"></param>
         /// <param name="name"></param>
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="dt">Data Table</param>
         /// <returns></returns>
@@ -191,7 +191,7 @@ namespace OpenSim.Data.SQLite
         /// lines for defining SqliteParameters to 2 parameters:
         /// column name and database type.
         /// </para>
-        /// 
+        ///
         /// <para>
         /// It assumes certain conventions like :param as the param
         /// name to replace in parametrized queries, and that source
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 2a0a8f6..4ef1f30 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Data.SQLite
         public bool DeleteItems(string[] fields, string[] vals)
         {
             return m_Items.Delete(fields, vals);
-        }        
+        }
 
         public bool MoveItem(string id, string newParent)
         {
@@ -302,20 +302,14 @@ namespace OpenSim.Data.SQLite
         {
 //            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
-            
+
             using (SqliteCommand cmd = new SqliteCommand())
             {
-                cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = ?folderID";
+                cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = :folderID";
                 cmd.Parameters.Add(new SqliteParameter(":folderID", folderID));
 
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception)
-                {
+                if(ExecuteNonQuery(cmd, m_Connection) == 0)
                     return false;
-                }
             }
 
             return true;
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index 5d7b169..70880cf 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.Tests
         public void T010_StoreReadVerifyAssets()
         {
             TestHelpers.InMethod();
-            
+
             AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
             AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
             AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3.ToString());
@@ -125,14 +125,20 @@ namespace OpenSim.Data.Tests
             m_db.StoreAsset(a1);
             m_db.StoreAsset(a2);
             m_db.StoreAsset(a3);
-            
+            a1.UploadAttempts = 0;
+            a2.UploadAttempts = 0;
+            a3.UploadAttempts = 0;
+
             AssetBase a1a = m_db.GetAsset(uuid1);
+            a1a.UploadAttempts = 0;
             Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
 
             AssetBase a2a = m_db.GetAsset(uuid2);
+            a2a.UploadAttempts = 0;
             Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
 
             AssetBase a3a = m_db.GetAsset(uuid3);
+            a3a.UploadAttempts = 0;
             Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
 
             scrambler.Scramble(a1a);
@@ -142,14 +148,20 @@ namespace OpenSim.Data.Tests
             m_db.StoreAsset(a1a);
             m_db.StoreAsset(a2a);
             m_db.StoreAsset(a3a);
+            a1a.UploadAttempts = 0;
+            a2a.UploadAttempts = 0;
+            a3a.UploadAttempts = 0;
 
             AssetBase a1b = m_db.GetAsset(uuid1);
+            a1b.UploadAttempts = 0;
             Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a));
 
             AssetBase a2b = m_db.GetAsset(uuid2);
+            a2b.UploadAttempts = 0;
             Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a));
 
             AssetBase a3b = m_db.GetAsset(uuid3);
+            a3b.UploadAttempts = 0;
             Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
 
             bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 });
@@ -178,7 +190,7 @@ namespace OpenSim.Data.Tests
         public void T020_CheckForWeirdCreatorID()
         {
             TestHelpers.InMethod();
-            
+
             // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
             // rather than a valid UUID (?).  This test is to make sure that the database layer does not
             // attempt to convert CreatorID to GUID, but just passes it both ways as a string.
@@ -190,16 +202,22 @@ namespace OpenSim.Data.Tests
             a3.Data = data1;
 
             m_db.StoreAsset(a1);
+            a1.UploadAttempts = 0;
             m_db.StoreAsset(a2);
+            a2.UploadAttempts = 0;
             m_db.StoreAsset(a3);
+            a3.UploadAttempts = 0;
 
             AssetBase a1a = m_db.GetAsset(uuid1);
+            a1a.UploadAttempts = 0;
             Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
 
             AssetBase a2a = m_db.GetAsset(uuid2);
+            a2a.UploadAttempts = 0;
             Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
 
             AssetBase a3a = m_db.GetAsset(uuid3);
+            a3a.UploadAttempts = 0;
             Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
         }
     }
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 8c296b9..79691e4 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -41,11 +41,11 @@ using System.Reflection;
 
 namespace OpenSim.Data.Tests
 {
-    /// <summary>This is a base class for testing any Data service for any DBMS. 
+    /// <summary>This is a base class for testing any Data service for any DBMS.
     /// Requires NUnit 2.5 or better (to support the generics).
     /// </summary>
     /// <remarks>
-    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with 
+    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with
     /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
     /// and similar on EstateTests, InventoryTests and RegionTests.
     /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts.
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests
         private TService m_service;
         private string m_file;
 
-        // TODO: Is this in the right place here? 
+        // TODO: Is this in the right place here?
         // Later:  apparently it's not, but does it matter here?
 //        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -68,7 +68,7 @@ namespace OpenSim.Data.Tests
 
         public BasicDataServiceTest()
             : this("")
-        { 
+        {
         }
 
         public BasicDataServiceTest(string conn)
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
                 if (String.IsNullOrEmpty(m_connStr))
                 {
                     m_file = Path.GetTempFileName() + ".db";
-                    m_connStr = "URI=file:../db/" + m_file + ",version=3";
+                    m_connStr = "URI=file:" + m_file + ",version=3";
                 }
             }
 
@@ -226,7 +226,7 @@ namespace OpenSim.Data.Tests
             }
         }
 
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
         /// </summary>
         /// <param name="tables"></param>
         protected virtual void ResetMigrations(params string[] stores)
@@ -251,7 +251,7 @@ namespace OpenSim.Data.Tests
             }
         }
 
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
         /// </summary>
         /// <param name="tables"></param>
         protected virtual void ClearTables(params string[] tables)
diff --git a/OpenSim/Data/Tests/DefaultTestConns.cs b/OpenSim/Data/Tests/DefaultTestConns.cs
index 7c47bdd..5ad238b 100644
--- a/OpenSim/Data/Tests/DefaultTestConns.cs
+++ b/OpenSim/Data/Tests/DefaultTestConns.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Data.Tests
     /// a connection string for testing one of the supported databases.
     /// The connections must be in the section [TestConnections] with names matching the connection class
     /// name for the specific database, e.g.:
-    /// 
+    ///
     /// [TestConnections]
     /// MySqlConnection="..."
     /// SqlConnection="..."
     /// SqliteConnection="..."
-    /// 
+    ///
     /// Note that the conn string may also be set explicitly in the [TestCase()] attribute of test classes
     /// based on BasicDataServiceTest.cs.
     /// </summary>
-    
+
     static class DefaultTestConns
     {
         private static Dictionary<Type, string> conns = new Dictionary<Type, string>();
@@ -63,8 +63,8 @@ namespace OpenSim.Data.Tests
             Assembly asm = Assembly.GetExecutingAssembly();
             string sType = connType.Name;
 
-            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get 
-            // to the INI file? Ok, so put it into the resources! 
+            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get
+            // to the INI file? Ok, so put it into the resources!
             // string iniName = Path.Combine(Path.GetDirectoryName(asm.Location), "TestDataConnections.ini");
 
             string[] allres = asm.GetManifestResourceNames();
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index e2b2d12..cf3f2b4 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Data.Tests
         public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MIN,
@@ -133,7 +133,7 @@ namespace OpenSim.Data.Tests
         public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MAX(64),
@@ -166,7 +166,7 @@ namespace OpenSim.Data.Tests
         public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
         {
             TestHelpers.InMethod();
-            
+
             EstateSettingsSimpleStorage(
                 REGION_ID,
                 DataTestUtil.STRING_MAX(1),
@@ -199,7 +199,7 @@ namespace OpenSim.Data.Tests
         public void T012_EstateSettingsRandomStorage()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
             new PropertyScrambler<EstateSettings>()
@@ -220,7 +220,7 @@ namespace OpenSim.Data.Tests
         public void T020_EstateSettingsManagerList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -241,7 +241,7 @@ namespace OpenSim.Data.Tests
         public void T021_EstateSettingsUserList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -262,7 +262,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsGroupList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -283,7 +283,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsBanList()
         {
             TestHelpers.InMethod();
-            
+
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
@@ -310,7 +310,7 @@ namespace OpenSim.Data.Tests
 
         #endregion
 
-        #region Parametrizable Test Implementations 
+        #region Parametrizable Test Implementations
 
         private void EstateSettingsSimpleStorage(
             UUID regionId,
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index 3edf89d..da6e7d4 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -44,14 +44,9 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
-    [TestFixture(Description = "Inventory store tests (SQLite)")]
-    public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore>
-    {
-    }
-
     [TestFixture(Description = "Inventory store tests (MySQL)")]
     public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData>
-    { 
+    {
     }
 
     public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
@@ -107,7 +102,7 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryFolder(folder1), Is.Null);
             Assert.That(db.getInventoryFolder(folder2), Is.Null);
@@ -127,7 +122,7 @@ namespace OpenSim.Data.Tests
         public void T010_FolderNonParent()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
             // the folder will go in
             db.addInventoryFolder(f1);
@@ -139,7 +134,7 @@ namespace OpenSim.Data.Tests
         public void T011_FolderCreate()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
             // TODO: this is probably wrong behavior, but is what we have
             // db.updateInventoryFolder(f1);
@@ -164,7 +159,7 @@ namespace OpenSim.Data.Tests
         public void T012_FolderList()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
             db.addInventoryFolder(f2);
 
@@ -180,7 +175,7 @@ namespace OpenSim.Data.Tests
         public void T013_FolderHierarchy()
         {
             TestHelpers.InMethod();
-            
+
             int n = db.getFolderHierarchy(zero).Count;  // (for dbg - easier to see what's returned)
             Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
             n = db.getFolderHierarchy(folder1).Count;
@@ -195,7 +190,7 @@ namespace OpenSim.Data.Tests
         public void T014_MoveFolder()
         {
             TestHelpers.InMethod();
-            
+
             InventoryFolderBase f2 = db.getInventoryFolder(folder2);
             f2.ParentID = folder3;
             db.moveInventoryFolder(f2);
@@ -211,7 +206,7 @@ namespace OpenSim.Data.Tests
         public void T015_FolderHierarchy()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
             Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
@@ -224,7 +219,7 @@ namespace OpenSim.Data.Tests
         public void T100_NoItems()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
             Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))");
@@ -238,7 +233,7 @@ namespace OpenSim.Data.Tests
         public void T101_CreatItems()
         {
             TestHelpers.InMethod();
-            
+
             db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
             db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
             db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
@@ -249,7 +244,7 @@ namespace OpenSim.Data.Tests
         public void T102_CompareItems()
         {
             TestHelpers.InMethod();
-            
+
             InventoryItemBase i1 = db.getInventoryItem(item1);
             InventoryItemBase i2 = db.getInventoryItem(item2);
             InventoryItemBase i3 = db.getInventoryItem(item3);
@@ -268,7 +263,7 @@ namespace OpenSim.Data.Tests
         public void T103_UpdateItem()
         {
             TestHelpers.InMethod();
-            
+
             // TODO: probably shouldn't have the ability to have an
             // owner of an item in a folder not owned by the user
 
@@ -288,7 +283,7 @@ namespace OpenSim.Data.Tests
         public void T104_RandomUpdateItem()
         {
             TestHelpers.InMethod();
-            
+
             PropertyScrambler<InventoryFolderBase> folderScrambler =
                 new PropertyScrambler<InventoryFolderBase>()
                     .DontScramble(x => x.Owner)
@@ -347,7 +342,7 @@ namespace OpenSim.Data.Tests
         public void T999_StillNull()
         {
             TestHelpers.InMethod();
-            
+
             // After all tests are run, these should still return no results
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryItem(zero), Is.Null);
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs
index e0f5862..0d291df 100644
--- a/OpenSim/Data/Tests/PropertyScrambler.cs
+++ b/OpenSim/Data/Tests/PropertyScrambler.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests
     public class PropertyScrambler<T>
     {
         readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>();
-        
+
         private void AddExpressionToNotScrableList(Expression expression)
         {
             UnaryExpression unaryExpression = expression as UnaryExpression;
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 8d4249a..4f81594 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -39,6 +39,7 @@ using OpenSim.Tests.Common;
 using log4net;
 using System.Reflection;
 using System.Data.Common;
+using System.Threading;
 
 // DBMS-specific:
 using MySql.Data.MySqlClient;
@@ -82,7 +83,7 @@ namespace OpenSim.Data.Tests
         public UUID item3 = UUID.Random();
 
         public static Random random = new Random();
-        
+
         public string itemname1 = "item1";
 
         public uint localID = 1;
@@ -110,10 +111,10 @@ namespace OpenSim.Data.Tests
 
         private void ClearDB()
         {
-            string[] reg_tables = new string[] { 
-                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings" 
+            string[] reg_tables = new string[] {
+                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings"
             };
-            
+
             if (m_rebuildDB)
             {
                 DropTables(reg_tables);
@@ -144,7 +145,7 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
             List<LandData> land = db.LoadLandObjects(region1);
@@ -153,21 +154,21 @@ namespace OpenSim.Data.Tests
             Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
             Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
         }
-        
+
         // SOG round trips
         //  * store objects, make sure they save
-        //  * update 
+        //  * update
 
         [Test]
         public void T010_StoreSimpleObject()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = NewSOG("object1", prim1, region1);
             SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
 
             // in case the objects don't store
-            try 
+            try
             {
                 db.StoreObject(sog, region1);
             }
@@ -176,8 +177,8 @@ namespace OpenSim.Data.Tests
                 m_log.Error(e.ToString());
                 Assert.Fail();
             }
-                    
-            try 
+
+            try
             {
                 db.StoreObject(sog2, region1);
             }
@@ -189,15 +190,15 @@ namespace OpenSim.Data.Tests
 
             // This tests the ADO.NET driver
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
-            
+
             Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
         }
-        
+
         [Test]
         public void T011_ObjectNames()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             foreach (SceneObjectGroup sog in objs)
             {
@@ -206,12 +207,12 @@ namespace OpenSim.Data.Tests
                 Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
             }
         }
-        
+
         [Test]
         public void T012_SceneParts()
         {
             TestHelpers.InMethod();
-            
+
             UUID tmp0 = UUID.Random();
             UUID tmp1 = UUID.Random();
             UUID tmp2 = UUID.Random();
@@ -224,10 +225,10 @@ namespace OpenSim.Data.Tests
             sog.AddPart(p1);
             sog.AddPart(p2);
             sog.AddPart(p3);
-            
+
             SceneObjectPart[] parts = sog.Parts;
             Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
-            
+
             db.StoreObject(sog, newregion);
             List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
             Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
@@ -235,18 +236,18 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
-            
+
             Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
             Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
             Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
             Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
         }
-        
+
         [Test]
         public void T013_DatabasePersistency()
         {
             TestHelpers.InMethod();
-            
+
             // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
             // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
             // The ObjectFlags is an exception, if it is entered incorrectly, the object IS REJECTED on the database silently.
@@ -259,7 +260,7 @@ namespace OpenSim.Data.Tests
             uint localid = localID+1;
             localID = localID + 1;
             string name = "Adam  West";
-            byte material = (byte) random.Next(127);
+            byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
             ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
             int pin = random.Next();
             Byte[] partsys = new byte[8];
@@ -297,7 +298,7 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart sop = new SceneObjectPart();
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            
+
             sop.RegionHandle = regionh;
             sop.UUID = uuid;
             sop.LocalId = localid;
@@ -359,10 +360,10 @@ namespace OpenSim.Data.Tests
             Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
             Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
             Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
-            
+
             // This is necessary or object will not be inserted in DB
             sop.Flags = PrimFlags.None;
-            
+
             // Inserts group in DB
             db.StoreObject(sog,region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
@@ -371,7 +372,7 @@ namespace OpenSim.Data.Tests
             db.StoreObject(sog,region3);
             sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-                
+
 
             // Tests if the parameters were inserted correctly
             SceneObjectPart p = sogs[0].RootPart;
@@ -413,12 +414,12 @@ namespace OpenSim.Data.Tests
             Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
             Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
         }
-        
+
         [Test]
         public void T014_UpdateObject()
         {
             TestHelpers.InMethod();
-            
+
             string text1 = "object1 text";
             SceneObjectGroup sog = FindSOG("object1", region1);
             sog.RootPart.Text = text1;
@@ -433,7 +434,7 @@ namespace OpenSim.Data.Tests
             TaskInventoryDictionary dic = new TaskInventoryDictionary();
             localID = localID + 1;
             string name = "West  Adam";
-            byte material = (byte) random.Next(127);
+            byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
             ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
             int pin = random.Next();
             Byte[] partsys = new byte[8];
@@ -458,7 +459,7 @@ namespace OpenSim.Data.Tests
             PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
             pbshap = PrimitiveBaseShape.Default;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            
+
             // Updates the region with new values
             SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
             Assert.That(sog2,Is.Not.Null);
@@ -487,11 +488,11 @@ namespace OpenSim.Data.Tests
             sog2.RootPart.LinkNum = linknum;
             sog2.RootPart.ClickAction = clickaction;
             sog2.RootPart.Scale = scale;
-            
+
             db.StoreObject(sog2, region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-            
+
             SceneObjectGroup retsog = FindSOG("West  Adam", region3);
             Assert.That(retsog,Is.Not.Null);
             SceneObjectPart p = retsog.RootPart;
@@ -518,7 +519,7 @@ namespace OpenSim.Data.Tests
             Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
             Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
         }
-                
+
         /// <summary>
         /// Test storage and retrieval of a scene object with a large number of parts.
         /// </summary>
@@ -526,12 +527,12 @@ namespace OpenSim.Data.Tests
         public void T015_LargeSceneObjects()
         {
             TestHelpers.InMethod();
-            
+
             UUID id = UUID.Random();
             Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
             SceneObjectGroup sog = NewSOG("Test SOG", id, region4);
             mydic.Add(sog.RootPart.UUID,sog.RootPart);
-            for (int i = 0; i < 30; i++) 
+            for (int i = 0; i < 30; i++)
             {
                 UUID tmp = UUID.Random();
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
@@ -541,20 +542,20 @@ namespace OpenSim.Data.Tests
                 Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
-                
+
                 sop.GroupPosition = groupos;
                 sop.RotationOffset = rotoff;
                 sop.OffsetPosition = offset;
                 sop.Velocity = velocity;
                 sop.AngularVelocity = angvelo;
                 sop.Acceleration = accel;
-                
+
                 mydic.Add(tmp,sop);
-                sog.AddPart(sop);                
+                sog.AddPart(sop);
             }
-            
+
             db.StoreObject(sog, region4);
-            
+
             SceneObjectGroup retsog = FindSOG("Test SOG", region4);
             SceneObjectPart[] parts = retsog.Parts;
             for (int i = 0; i < 30; i++)
@@ -573,7 +574,7 @@ namespace OpenSim.Data.Tests
         public void T016_RandomSogWithSceneParts()
         {
             TestHelpers.InMethod();
-            
+
             PropertyScrambler<SceneObjectPart> scrambler =
                 new PropertyScrambler<SceneObjectPart>()
                     .DontScramble(x => x.UUID);
@@ -633,22 +634,22 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = FindSOG(name, region1);
             if (sog == null)
             {
-                sog = NewSOG(name, prim1, region1); 
+                sog = NewSOG(name, prim1, region1);
                 db.StoreObject(sog, region1);
             }
             return sog;
         }
-        
+
         // NOTE: it is a bad practice to rely on some of the previous tests having been run before.
         // If the tests are run manually, one at a time, each starts with full class init (DB cleared).
         // Even when all tests are run, NUnit 2.5+ no longer guarantee a specific test order.
         // We shouldn't expect to find anything in the DB if we haven't put it there *in the same test*!
-        
+
         [Test]
         public void T020_PrimInventoryEmpty()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
@@ -672,14 +673,14 @@ namespace OpenSim.Data.Tests
         public void T021_PrimInventoryBasic()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
-            
+
             StoreInventory(sog);
 
             SceneObjectGroup sog1 = FindSOG("object1", region1);
@@ -707,12 +708,12 @@ namespace OpenSim.Data.Tests
             t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
         }
-        
+
         [Test]
         public void T025_PrimInventoryPersistency()
         {
             TestHelpers.InMethod();
-            
+
             InventoryItemBase i = new InventoryItemBase();
             UUID id = UUID.Random();
             i.ID = id;
@@ -751,11 +752,11 @@ namespace OpenSim.Data.Tests
             i.Flags = flags;
             int creationd = random.Next();
             i.CreationDate = creationd;
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
-            
+
             Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
             Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
             Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
@@ -779,13 +780,13 @@ namespace OpenSim.Data.Tests
             Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
             Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
         }
-        
+
         [Test]
         [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
             TestHelpers.InMethod();
-            
+
             UUID i1,i2,i3,i4;
             i1 = UUID.Random();
             i2 = UUID.Random();
@@ -795,14 +796,14 @@ namespace OpenSim.Data.Tests
             InventoryItemBase ib2 = NewItem(i2, zero, zero, RandomName(), zero);
             InventoryItemBase ib3 = NewItem(i3, zero, zero, RandomName(), zero);
             InventoryItemBase ib4 = NewItem(i4, zero, zero, RandomName(), zero);
-            
+
             SceneObjectGroup sog = FindSOG("object1", region1);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib1, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib2, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib3, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib4, zero), Is.True);
-            
+
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
             Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
             TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
@@ -817,7 +818,7 @@ namespace OpenSim.Data.Tests
         public void T052_RemoveObject()
         {
             TestHelpers.InMethod();
-            
+
             db.RemoveObject(prim1, region1);
             SceneObjectGroup sog = FindSOG("object1", region1);
             Assert.That(sog, Is.Null);
@@ -827,7 +828,7 @@ namespace OpenSim.Data.Tests
         public void T100_DefaultRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             RegionSettings r1 = db.LoadRegionSettings(region1);
             Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
 
@@ -839,7 +840,7 @@ namespace OpenSim.Data.Tests
         public void T101_UpdateRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             int agentlimit = random.Next();
             double objectbonus = random.Next();
             int maturity = random.Next();
@@ -899,9 +900,9 @@ namespace OpenSim.Data.Tests
             r1.FixedSun = true;
             r1.SunPosition = sunpos;
             r1.Covenant = cov;
-            
+
             db.StoreRegionSettings(r1);
-            
+
             RegionSettings r1a = db.LoadRegionSettings(region1);
             Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
             Assert.That(r1a.BlockTerraform,Is.True);
@@ -938,14 +939,14 @@ namespace OpenSim.Data.Tests
             //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
             Assert.That(r1a.FixedSun,Is.True);
             Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
-            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");            
+            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
         }
 
         [Test]
         public void T300_NoTerrain()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -956,10 +957,13 @@ namespace OpenSim.Data.Tests
         public void T301_CreateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] t1 = GenTerrain(height1);
             db.StoreTerrain(t1, region1);
-            
+
+            // store terrain is async
+            Thread.Sleep(1000);
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Not.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -970,7 +974,7 @@ namespace OpenSim.Data.Tests
         public void T302_FetchTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             double[,] t1 = db.LoadTerrain(region1);
@@ -982,11 +986,14 @@ namespace OpenSim.Data.Tests
         public void T303_UpdateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             db.StoreTerrain(baseterrain2, region1);
 
+            // store terrain is async
+            Thread.Sleep(1000);
+
             double[,] t1 = db.LoadTerrain(region1);
             Assert.That(CompareTerrain(t1, baseterrain1), Is.False);
             Assert.That(CompareTerrain(t1, baseterrain2), Is.True);
@@ -996,7 +1003,7 @@ namespace OpenSim.Data.Tests
         public void T400_EmptyLand()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
@@ -1018,15 +1025,15 @@ namespace OpenSim.Data.Tests
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
                     terret[x,y] = value;
-            
+
             return terret;
         }
-        
+
         private bool CompareTerrain(double[,] one, double[,] two)
         {
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
-                    if (one[x,y] != two[x,y]) 
+                    if (one[x,y] != two[x,y])
                         return false;
 
             return true;
@@ -1046,12 +1053,12 @@ namespace OpenSim.Data.Tests
         // common failure case is people adding new fields that aren't
         // initialized, but have non-null db constraints.  We should
         // honestly be passing more and more null things in here.
-        // 
-        // Please note that in Sqlite.BuildPrim there is a commented out inline version 
+        //
+        // Please note that in Sqlite.BuildPrim there is a commented out inline version
         // of this so you can debug and step through the build process and check the fields
-        // 
+        //
         // Real World Value: Tests for situation where extending a SceneObjectGroup/SceneObjectPart
-        //                   causes the application to crash at the database layer because of null values 
+        //                   causes the application to crash at the database layer because of null values
         //                   in NOT NULL fields
         //
         private SceneObjectGroup NewSOG(string name, UUID uuid, UUID regionId)
@@ -1075,7 +1082,7 @@ namespace OpenSim.Data.Tests
 
             return sog;
         }
-        
+
         private SceneObjectPart NewSOP(string name, UUID uuid)
         {
             SceneObjectPart sop = new SceneObjectPart();
@@ -1089,7 +1096,7 @@ namespace OpenSim.Data.Tests
             return sop;
         }
 
-        // These are copied from the Inventory Item tests 
+        // These are copied from the Inventory Item tests
 
         private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
         {
@@ -1107,7 +1114,7 @@ namespace OpenSim.Data.Tests
         private static string RandomName()
         {
             StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12); 
+            int size = random.Next(5,12);
             char ch ;
             for (int i=0; i<size; i++)
             {
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 75f7855..7b55467 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -16,9 +16,9 @@
 ; file for the DB.  If you want the resulting DB to persist (e.g. for performance testing,
 ; when filling up the tables can take a long time), explicitly specify a conn string like this: 
 
-; SqliteConnection="URI=file:../db/<path_to_your_file>,version=3"
+; SqliteConnection="URI=file:<path_to_your_file>,version=3"
 
 [TestConnections]
 MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
 SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection="URI=file:../db/opensim-nunit.db,version=3"
\ No newline at end of file
+SqliteConnection="URI=file:opensim-nunit.db,version=3"
\ No newline at end of file