245 files changed, 5999 insertions, 4893 deletions

diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 39923cb..6b169bd 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1038,23 +1038,6 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendAvatarData(SendAvatarData data)
-        {
-            //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
-            UUID ownerID = data.AvatarID;
-            MXPSendAvatarData(data.FirstName + " " + data.LastName, ownerID, UUID.Zero, data.AvatarID, data.AvatarLocalID, data.Position, data.Rotation);
-        }
-
-        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-            MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = data.LocalID;
-            me.Location = ToOmVector(data.Position);
-            me.Orientation = ToOmQuaternion(data.Rotation);
-
-            Session.Send(me);
-        }
-
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
             // Minimap function, not used.
@@ -1070,23 +1053,31 @@ namespace OpenSim.Client.MXP.ClientStack
             // Need to translate to MXP somehow
         }
 
-        public void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
-            MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
-                data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
-                data.material, data.textureanim);
+            //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID);
+            ScenePresence presence = (ScenePresence)avatar;
+            UUID ownerID = presence.UUID;
+            MXPSendAvatarData(presence.Firstname + " " + presence.Lastname, ownerID, UUID.Zero, presence.UUID, presence.LocalId, presence.AbsolutePosition, presence.Rotation);
         }
 
-        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
-            MovementEventMessage me = new MovementEventMessage();
-            me.ObjectIndex = data.LocalID;
-            me.Location = ToOmVector(data.Position);
-            me.Orientation = ToOmQuaternion(data.Rotation);
-            Session.Send(me);
+            //MovementEventMessage me = new MovementEventMessage();
+            //me.ObjectIndex = data.LocalID;
+            //me.Location = ToOmVector(data.Position);
+            //me.Orientation = ToOmQuaternion(data.Rotation);
+
+            //MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel,
+            //    data.rotation, (uint)data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction,
+            //    data.material, data.textureanim);
+
+            //Session.Send(me);
+
+            throw new System.NotImplementedException();
         }
 
-        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 7c8a979..181606b 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -593,16 +593,6 @@ namespace OpenSim.Client.Sirikata.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendAvatarData(SendAvatarData data)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-            throw new System.NotImplementedException();
-        }
-
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
             throw new System.NotImplementedException();
@@ -618,27 +608,27 @@ namespace OpenSim.Client.Sirikata.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
             throw new System.NotImplementedException();
         }
 
-        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
+        public void FlushPrimUpdates()
         {
             throw new System.NotImplementedException();
         }
 
-        public void FlushPrimUpdates()
+        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
         {
             throw new System.NotImplementedException();
         }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 5ad1643..febdd1b 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -599,16 +599,6 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendAvatarData(SendAvatarData data)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-            throw new System.NotImplementedException();
-        }
-
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
             throw new System.NotImplementedException();
@@ -624,17 +614,17 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
             throw new System.NotImplementedException();
         }
 
-        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
             throw new System.NotImplementedException();
         }
 
-        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
             throw new System.NotImplementedException();
         }
diff --git a/OpenSim/Data/DBGuids.cs b/OpenSim/Data/DBGuids.cs
new file mode 100644
index 0000000..fb6832b
--- /dev/null
+++ b/OpenSim/Data/DBGuids.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Data
+{
+
+    public static class DBGuid
+    {
+        /// <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>
+        public static UUID FromDB(object id)
+        {
+            if( (id == null) || (id == DBNull.Value))
+                return UUID.Zero;
+
+            if (id.GetType() == typeof(Guid))
+                return new UUID((Guid)id);
+
+            if (id.GetType() == typeof(byte[]))
+            {
+                if (((byte[])id).Length == 0)
+                    return UUID.Zero;
+                else if (((byte[])id).Length == 16)
+                    return new UUID((byte[])id, 0);
+            }
+            else if (id.GetType() == typeof(string))
+            {
+                if (((string)id).Length == 0)
+                    return UUID.Zero;
+                else if (((string)id).Length == 36)
+                    return new UUID((string)id);
+            }
+
+            throw new Exception("Failed to convert db value to UUID: " + id.ToString());
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 474f706..66931e2 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -101,22 +101,30 @@ namespace OpenSim.Data.MSSQL
                     {
                         foreach (string name in FieldList)
                         {
-                            if (_FieldMap[name].GetValue(es) is bool)
+                            FieldInfo f = _FieldMap[name];
+                            object v = reader[name];
+                            if (f.FieldType == typeof(bool) )
                             {
-                                int v = Convert.ToInt32(reader[name]);
-                                if (v != 0)
-                                    _FieldMap[name].SetValue(es, true);
-                                else
-                                    _FieldMap[name].SetValue(es, false);
+                                f.SetValue(es, Convert.ToInt32(v) != 0);
                             }
-                            else if (_FieldMap[name].GetValue(es) is UUID)
+                            else if (f.FieldType == typeof(UUID) )
                             {
-                                _FieldMap[name].SetValue(es, new UUID((Guid)reader[name])); // uuid);
+                                f.SetValue(es, new UUID((Guid)v)); // uuid);
                             }
-                            else
+                            else if (f.FieldType == typeof(string)) 
+                            {
+                                f.SetValue(es, v.ToString());
+                            }
+                            else if (f.FieldType == typeof(UInt32))  
                             {
-                                es.EstateID = Convert.ToUInt32(reader["EstateID"].ToString());
+                                f.SetValue(es, Convert.ToUInt32(v));
                             }
+                            else if (f.FieldType == typeof(Single))
+                            {
+                                f.SetValue(es, Convert.ToSingle(v));
+                            }
+                            else
+                                f.SetValue(es, v);
                         }
                     }
                     else
@@ -288,61 +296,45 @@ namespace OpenSim.Data.MSSQL
         private void SaveBanList(EstateSettings es)
         {
             //Delete first
-            string sql = "delete from estateban where EstateID = @EstateID";
             using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
                 conn.Open();
-                cmd.ExecuteNonQuery();
-            }
-
-            //Insert after
-            sql = "insert into estateban (EstateID, bannedUUID) values ( @EstateID, @bannedUUID )";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                foreach (EstateBan b in es.EstateBans)
+                using (SqlCommand cmd = conn.CreateCommand())
                 {
-                    cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
-                    cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.BannedUserID));
-                    conn.Open();
+                    cmd.CommandText  = "delete from estateban where EstateID = @EstateID";
+                    cmd.Parameters.AddWithValue("@EstateID", (int)es.EstateID);
                     cmd.ExecuteNonQuery();
-                    cmd.Parameters.Clear();
+
+                    //Insert after
+                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID) values ( @EstateID, @bannedUUID )";
+                    cmd.Parameters.AddWithValue("@bannedUUID", Guid.Empty);
+                    foreach (EstateBan b in es.EstateBans)
+                    {
+                        cmd.Parameters["@bannedUUID"].Value = b.BannedUserID.Guid;
+                        cmd.ExecuteNonQuery();
+                    }
                 }
             }
         }
 
         private void SaveUUIDList(uint estateID, string table, UUID[] data)
         {
-            //Delete first
-            string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
             using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
-                cmd.ExecuteNonQuery();
-            }
-
-            sql = string.Format("insert into {0} (EstateID, uuid) values ( @EstateID, @uuid )", table);
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
-
-                bool createParamOnce = true;
-
-                foreach (UUID uuid in data)
+                conn.Open();
+                using (SqlCommand cmd = conn.CreateCommand())
                 {
-                    if (createParamOnce)
+                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
+                    cmd.CommandText = string.Format("delete from {0} where EstateID = @EstateID", table);
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = string.Format("insert into {0} (EstateID, uuid) values ( @EstateID, @uuid )", table);
+                    cmd.Parameters.AddWithValue("@uuid", Guid.Empty);
+                    foreach (UUID uuid in data)
                     {
-                        cmd.Parameters.Add(_Database.CreateParameter("@uuid", uuid));
-                        createParamOnce = false;
-                    }
-                    else
                         cmd.Parameters["@uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
-                    conn.Open();
-                    cmd.ExecuteNonQuery();
+                        cmd.ExecuteNonQuery();
+                    }
                 }
             }
         }
diff --git a/OpenSim/Data/MSSQL/Resources/001_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/001_AssetStore.sql
deleted file mode 100644
index 2b293c7..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_AssetStore.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE [assets] (
-  [id] [varchar](36) NOT NULL,
-  [name] [varchar](64) NOT NULL,
-  [description] [varchar](64) NOT NULL,
-  [assetType] [tinyint] NOT NULL,
-  [local] [tinyint] NOT NULL,
-  [temporary] [tinyint] NOT NULL,
-  [data] [image] NOT NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [id] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
diff --git a/OpenSim/Data/MSSQL/Resources/001_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/001_EstateStore.sql
deleted file mode 100644
index 9bb2f75..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_EstateStore.sql
+++ /dev/null
@@ -1,85 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[estate_managers](
-        [EstateID] [int] NOT NULL,
-        [uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_managers] PRIMARY KEY CLUSTERED 
-(
-        [EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-CREATE TABLE [dbo].[estate_groups](
-        [EstateID] [int] NOT NULL,
-        [uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_groups] PRIMARY KEY CLUSTERED 
-(
-        [EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[estate_users](
-        [EstateID] [int] NOT NULL,
-        [uuid] [varchar](36) NOT NULL,
- CONSTRAINT [PK_estate_users] PRIMARY KEY CLUSTERED 
-(
-        [EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[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),
- CONSTRAINT [PK_estateban] PRIMARY KEY CLUSTERED 
-(
-        [EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-CREATE TABLE [dbo].[estate_settings](
-        [EstateID] [int] IDENTITY(1,100) NOT NULL,
-        [EstateName] [varchar](64) NULL DEFAULT (NULL),
-        [AbuseEmailToEstateOwner] [bit] NOT NULL,
-        [DenyAnonymous] [bit] NOT NULL,
-        [ResetHomeOnTeleport] [bit] NOT NULL,
-        [FixedSun] [bit] NOT NULL,
-        [DenyTransacted] [bit] NOT NULL,
-        [BlockDwell] [bit] NOT NULL,
-        [DenyIdentified] [bit] NOT NULL,
-        [AllowVoice] [bit] NOT NULL,
-        [UseGlobalTime] [bit] NOT NULL,
-        [PricePerMeter] [int] NOT NULL,
-        [TaxFree] [bit] NOT NULL,
-        [AllowDirectTeleport] [bit] NOT NULL,
-        [RedirectGridX] [int] NOT NULL,
-        [RedirectGridY] [int] NOT NULL,
-        [ParentEstateID] [int] NOT NULL,
-        [SunPosition] [float] NOT NULL,
-        [EstateSkipScripts] [bit] NOT NULL,
-        [BillableFactor] [float] NOT NULL,
-        [PublicAccess] [bit] NOT NULL,
-        [AbuseEmail] [varchar](255) NOT NULL,
-        [EstateOwner] [varchar](36) NOT NULL,
-        [DenyMinors] [bit] NOT NULL,
- CONSTRAINT [PK_estate_settings] PRIMARY KEY CLUSTERED 
-(
-        [EstateID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-
-CREATE TABLE [dbo].[estate_map](
-        [RegionID] [varchar](36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        [EstateID] [int] NOT NULL,
- CONSTRAINT [PK_estate_map] PRIMARY KEY CLUSTERED 
-(
-        [RegionID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY];
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_GridStore.sql b/OpenSim/Data/MSSQL/Resources/001_GridStore.sql
deleted file mode 100644
index ff15f54..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_GridStore.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE [dbo].[regions](
- [regionHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionName] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [uuid] [varchar](255) COLLATE Latin1_General_CI_AS NOT NULL,
- [regionRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionSecret] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionDataURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverIP] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locX] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locY] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [locZ] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [eastOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [westOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [southOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [northOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionAssetSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionUserSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
- [owner_uuid] [varchar](36) COLLATE Latin1_General_CI_AS NULL,
-PRIMARY KEY CLUSTERED 
-(
- [uuid] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/001_InventoryStore.sql b/OpenSim/Data/MSSQL/Resources/001_InventoryStore.sql
deleted file mode 100644
index 836d2d1..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_InventoryStore.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-BEGIN TRANSACTION
-
-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 CLUSTERED
-(
-        [folderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [owner] ON [inventoryfolders]
-(
-        [agentID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [parent] ON [inventoryfolders]
-(
-        [parentFolderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [inventoryitems] (
-  [inventoryID] [varchar](36) NOT NULL default '',
-  [assetID] [varchar](36) default NULL,
-  [assetType] [int] default NULL,
-  [parentFolderID] [varchar](36) default NULL,
-  [avatarID] [varchar](36) default NULL,
-  [inventoryName] [varchar](64) default NULL,
-  [inventoryDescription] [varchar](128) default NULL,
-  [inventoryNextPermissions] [int] default NULL,
-  [inventoryCurrentPermissions] [int] default NULL,
-  [invType] [int] default NULL,
-  [creatorID] [varchar](36) default NULL,
-  [inventoryBasePermissions] [int] NOT NULL default 0,
-  [inventoryEveryOnePermissions] [int] NOT NULL default 0,
-  [salePrice] [int] default NULL,
-  [saleType] [tinyint] default NULL,
-  [creationDate] [int] default NULL,
-  [groupID] [varchar](36) default NULL,
-  [groupOwned] [bit] default NULL,
-  [flags] [int] default NULL,
-  PRIMARY KEY CLUSTERED
-(
-        [inventoryID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [owner] ON [inventoryitems]
-(
-        [avatarID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [folder] ON [inventoryitems]
-(
-        [parentFolderID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/001_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/001_RegionStore.sql
deleted file mode 100644
index fe7c58f..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_RegionStore.sql
+++ /dev/null
@@ -1,161 +0,0 @@
-CREATE TABLE [dbo].[prims](
-        [UUID] [varchar](255) NOT NULL,
-        [RegionUUID] [varchar](255) NULL,
-        [ParentID] [int] NULL,
-        [CreationDate] [int] NULL,
-        [Name] [varchar](255) NULL,
-        [SceneGroupID] [varchar](255) NULL,
-        [Text] [varchar](255) NULL,
-        [Description] [varchar](255) NULL,
-        [SitName] [varchar](255) NULL,
-        [TouchName] [varchar](255) NULL,
-        [ObjectFlags] [int] NULL,
-        [CreatorID] [varchar](255) NULL,
-        [OwnerID] [varchar](255) NULL,
-        [GroupID] [varchar](255) NULL,
-        [LastOwnerID] [varchar](255) NULL,
-        [OwnerMask] [int] NULL,
-        [NextOwnerMask] [int] NULL,
-        [GroupMask] [int] NULL,
-        [EveryoneMask] [int] NULL,
-        [BaseMask] [int] NULL,
-        [PositionX] [float] NULL,
-        [PositionY] [float] NULL,
-        [PositionZ] [float] NULL,
-        [GroupPositionX] [float] NULL,
-        [GroupPositionY] [float] NULL,
-        [GroupPositionZ] [float] NULL,
-        [VelocityX] [float] NULL,
-        [VelocityY] [float] NULL,
-        [VelocityZ] [float] NULL,
-        [AngularVelocityX] [float] NULL,
-        [AngularVelocityY] [float] NULL,
-        [AngularVelocityZ] [float] NULL,
-        [AccelerationX] [float] NULL,
-        [AccelerationY] [float] NULL,
-        [AccelerationZ] [float] NULL,
-        [RotationX] [float] NULL,
-        [RotationY] [float] NULL,
-        [RotationZ] [float] NULL,
-        [RotationW] [float] NULL,
-        [SitTargetOffsetX] [float] NULL,
-        [SitTargetOffsetY] [float] NULL,
-        [SitTargetOffsetZ] [float] NULL,
-        [SitTargetOrientW] [float] NULL,
-        [SitTargetOrientX] [float] NULL,
-        [SitTargetOrientY] [float] NULL,
-        [SitTargetOrientZ] [float] NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [UUID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-CREATE TABLE [dbo].[primshapes](
-        [UUID] [varchar](255) NOT NULL,
-        [Shape] [int] NULL,
-        [ScaleX] [float] NULL,
-        [ScaleY] [float] NULL,
-        [ScaleZ] [float] NULL,
-        [PCode] [int] NULL,
-        [PathBegin] [int] NULL,
-        [PathEnd] [int] NULL,
-        [PathScaleX] [int] NULL,
-        [PathScaleY] [int] NULL,
-        [PathShearX] [int] NULL,
-        [PathShearY] [int] NULL,
-        [PathSkew] [int] NULL,
-        [PathCurve] [int] NULL,
-        [PathRadiusOffset] [int] NULL,
-        [PathRevolutions] [int] NULL,
-        [PathTaperX] [int] NULL,
-        [PathTaperY] [int] NULL,
-        [PathTwist] [int] NULL,
-        [PathTwistBegin] [int] NULL,
-        [ProfileBegin] [int] NULL,
-        [ProfileEnd] [int] NULL,
-        [ProfileCurve] [int] NULL,
-        [ProfileHollow] [int] NULL,
-        [State] [int] NULL,
-        [Texture] [image] NULL,
-        [ExtraParams] [image] NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [UUID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-CREATE TABLE [dbo].[primitems](
-        [itemID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
-        [primID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [assetID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [parentFolderID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [invType] [int] NULL,
-        [assetType] [int] NULL,
-        [name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [description] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [creationDate] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [creatorID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [ownerID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [lastOwnerID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [groupID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [nextPermissions] [int] NULL,
-        [currentPermissions] [int] NULL,
-        [basePermissions] [int] NULL,
-        [everyonePermissions] [int] NULL,
-        [groupPermissions] [int] NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [itemID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-CREATE TABLE [dbo].[terrain](
-        [RegionUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [Revision] [int] NULL,
-        [Heightfield] [image] NULL
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-CREATE TABLE [dbo].[land](
-        [UUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
-        [RegionUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [LocalLandID] [int] NULL,
-        [Bitmap] [image] NULL,
-        [Name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [Description] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [OwnerUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [IsGroupOwned] [int] NULL,
-        [Area] [int] NULL,
-        [AuctionID] [int] NULL,
-        [Category] [int] NULL,
-        [ClaimDate] [int] NULL,
-        [ClaimPrice] [int] NULL,
-        [GroupUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [SalePrice] [int] NULL,
-        [LandStatus] [int] NULL,
-        [LandFlags] [int] NULL,
-        [LandingType] [int] NULL,
-        [MediaAutoScale] [int] NULL,
-        [MediaTextureUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [MediaURL] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [MusicURL] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [PassHours] [float] NULL,
-        [PassPrice] [int] NULL,
-        [SnapshotUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [UserLocationX] [float] NULL,
-        [UserLocationY] [float] NULL,
-        [UserLocationZ] [float] NULL,
-        [UserLookAtX] [float] NULL,
-        [UserLookAtY] [float] NULL,
-        [UserLookAtZ] [float] NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [UUID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
-
-CREATE TABLE [dbo].[landaccesslist](
-        [LandUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [AccessUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-        [Flags] [int] NULL
-) ON [PRIMARY]
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql
deleted file mode 100644
index 3dbf8a4..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE [UserAccounts] (
-  [PrincipalID] uniqueidentifier NOT NULL,
-  [ScopeID] uniqueidentifier NOT NULL,
-  [FirstName] [varchar](64) NOT NULL,
-  [LastName] [varchar](64) NOT NULL,
-  [Email] [varchar](64) NULL,
-  [ServiceURLs] [text] NULL,
-  [Created] [int] default NULL,
-  
-  PRIMARY KEY CLUSTERED
-(
-        [PrincipalID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
diff --git a/OpenSim/Data/MSSQL/Resources/001_UserStore.sql b/OpenSim/Data/MSSQL/Resources/001_UserStore.sql
deleted file mode 100644
index 160c457..0000000
--- a/OpenSim/Data/MSSQL/Resources/001_UserStore.sql
+++ /dev/null
@@ -1,112 +0,0 @@
-CREATE TABLE [users] (
-  [UUID] [varchar](36) NOT NULL default '',
-  [username] [varchar](32) NOT NULL,
-  [lastname] [varchar](32) NOT NULL,
-  [passwordHash] [varchar](32) NOT NULL,
-  [passwordSalt] [varchar](32) NOT NULL,
-  [homeRegion] [bigint] default NULL,
-  [homeLocationX] [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] NOT NULL,
-  [lastLogin] [int] NOT NULL,
-  [userInventoryURI] [varchar](255) default NULL,
-  [userAssetURI] [varchar](255) default NULL,
-  [profileCanDoMask] [int] default NULL,
-  [profileWantDoMask] [int] default NULL,
-  [profileAboutText] [ntext],
-  [profileFirstText] [ntext],
-  [profileImage] [varchar](36) default NULL,
-  [profileFirstImage] [varchar](36) default NULL,
-  [webLoginKey] [varchar](36) default NULL,
-  PRIMARY KEY CLUSTERED
-(
-        [UUID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [usernames] ON [users]
-(
-        [username] ASC,
-        [lastname] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [agents] (
-  [UUID] [varchar](36) NOT NULL,
-  [sessionID] [varchar](36) NOT NULL,
-  [secureSessionID] [varchar](36) NOT NULL,
-  [agentIP] [varchar](16) NOT NULL,
-  [agentPort] [int] NOT NULL,
-  [agentOnline] [tinyint] NOT NULL,
-  [loginTime] [int] NOT NULL,
-  [logoutTime] [int] NOT NULL,
-  [currentRegion] [varchar](36) NOT NULL,
-  [currentHandle] [bigint] NOT NULL,
-  [currentPos] [varchar](64) NOT NULL,
-  PRIMARY KEY CLUSTERED
-(
-        [UUID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX [session] ON [agents]
-(
-        [sessionID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX [ssession] ON [agents]
-(
-        [secureSessionID] ASC
-)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-
-
-CREATE TABLE [dbo].[userfriends](
-        [ownerID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
-        [friendID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
-        [friendPerms] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
-        [datetimestamp] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
-) ON [PRIMARY]
-
-CREATE TABLE [avatarappearance]  (
-  [Owner]  [varchar](36) NOT NULL,
-  [Serial]  int NOT NULL,
-  [Visual_Params] [image] NOT NULL,
-  [Texture] [image] NOT NULL,
-  [Avatar_Height] float NOT NULL,
-  [Body_Item] [varchar](36) NOT NULL,
-  [Body_Asset] [varchar](36) NOT NULL,
-  [Skin_Item] [varchar](36) NOT NULL,
-  [Skin_Asset] [varchar](36) NOT NULL,
-  [Hair_Item] [varchar](36) NOT NULL,
-  [Hair_Asset] [varchar](36) NOT NULL,
-  [Eyes_Item] [varchar](36) NOT NULL,
-  [Eyes_Asset] [varchar](36) NOT NULL,
-  [Shirt_Item] [varchar](36) NOT NULL,
-  [Shirt_Asset] [varchar](36) NOT NULL,
-  [Pants_Item] [varchar](36) NOT NULL,
-  [Pants_Asset] [varchar](36) NOT NULL,
-  [Shoes_Item] [varchar](36) NOT NULL,
-  [Shoes_Asset] [varchar](36) NOT NULL,
-  [Socks_Item] [varchar](36) NOT NULL,
-  [Socks_Asset] [varchar](36) NOT NULL,
-  [Jacket_Item] [varchar](36) NOT NULL,
-  [Jacket_Asset] [varchar](36) NOT NULL,
-  [Gloves_Item] [varchar](36) NOT NULL,
-  [Gloves_Asset] [varchar](36) NOT NULL,
-  [Undershirt_Item] [varchar](36) NOT NULL,
-  [Undershirt_Asset] [varchar](36) NOT NULL,
-  [Underpants_Item] [varchar](36) NOT NULL,
-  [Underpants_Asset] [varchar](36) NOT NULL,
-  [Skirt_Item] [varchar](36) NOT NULL,
-  [Skirt_Asset] [varchar](36) NOT NULL,
-
-  PRIMARY KEY  CLUSTERED (
-  [Owner]
-  ) WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
-) ON [PRIMARY]
diff --git a/OpenSim/Data/MSSQL/Resources/002_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/002_AssetStore.sql
deleted file mode 100644
index 3e24543..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_AssetStore.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_assets
-        (
-        id varchar(36) NOT NULL,
-        name varchar(64) NOT NULL,
-        description varchar(64) NOT NULL,
-        assetType tinyint NOT NULL,
-        local bit NOT NULL,
-        temporary bit NOT NULL,
-        data image NOT NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM assets)
-         EXEC('INSERT INTO Tmp_assets (id, name, description, assetType, local, temporary, data)
-                SELECT id, name, description, assetType, CONVERT(bit, local), CONVERT(bit, temporary), data FROM assets WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE assets
-
-EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
-
-ALTER TABLE dbo.assets ADD CONSTRAINT
-        PK__assets__id PRIMARY KEY CLUSTERED 
-        (
-        id
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/002_AuthStore.sql b/OpenSim/Data/MSSQL/Resources/002_AuthStore.sql
deleted file mode 100644
index daed955..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_AuthStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION
-
-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
-
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/002_EstateStore.sql
deleted file mode 100644
index 18c12c0..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_EstateStore.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE dbo.estate_managers DROP CONSTRAINT PK_estate_managers
-
-CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-ALTER TABLE dbo.estate_groups DROP CONSTRAINT PK_estate_groups
-
-CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-ALTER TABLE dbo.estate_users DROP CONSTRAINT PK_estate_users
-
-CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/002_FriendsStore.sql b/OpenSim/Data/MSSQL/Resources/002_FriendsStore.sql
deleted file mode 100644
index e67d20e..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_FriendsStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION
-
-INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
-
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_GridStore.sql b/OpenSim/Data/MSSQL/Resources/002_GridStore.sql
deleted file mode 100644
index f5901cb..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_GridStore.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_regions
-        (
-        uuid varchar(36) COLLATE Latin1_General_CI_AS NOT NULL,
-        regionHandle bigint NULL,
-        regionName varchar(20) NULL,
-        regionRecvKey varchar(128) NULL,
-        regionSendKey varchar(128) NULL,
-        regionSecret varchar(128) NULL,
-        regionDataURI varchar(128) NULL,
-        serverIP varchar(64) NULL,
-        serverPort int NULL,
-        serverURI varchar(255) NULL,
-        locX int NULL,
-        locY int NULL,
-        locZ int NULL,
-        eastOverrideHandle bigint NULL,
-        westOverrideHandle bigint NULL,
-        southOverrideHandle bigint NULL,
-        northOverrideHandle bigint NULL,
-        regionAssetURI varchar(255) NULL,
-        regionAssetRecvKey varchar(128) NULL,
-        regionAssetSendKey varchar(128) NULL,
-        regionUserURI varchar(255) NULL,
-        regionUserRecvKey varchar(128) NULL,
-        regionUserSendKey varchar(128) NULL,
-        regionMapTexture varchar(36) NULL,
-        serverHttpPort int NULL,
-        serverRemotingPort int NULL,
-        owner_uuid varchar(36) NULL,
-        originUUID varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM regions)
-         EXEC('INSERT INTO Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid)
-                SELECT CONVERT(varchar(36), uuid), CONVERT(bigint, regionHandle), CONVERT(varchar(20), regionName), CONVERT(varchar(128), regionRecvKey), CONVERT(varchar(128), regionSendKey), CONVERT(varchar(128), regionSecret), CONVERT(varchar(128), regionDataURI), CONVERT(varchar(64), serverIP), CONVERT(int, serverPort), serverURI, CONVERT(int, locX), CONVERT(int, locY), CONVERT(int, locZ), CONVERT(bigint, eastOverrideHandle), CONVERT(bigint, westOverrideHandle), CONVERT(bigint, southOverrideHandle), CONVERT(bigint, northOverrideHandle), regionAssetURI, CONVERT(varchar(128), regionAssetRecvKey), CONVERT(varchar(128), regionAssetSendKey), regionUserURI, CONVERT(varchar(128), regionUserRecvKey), CONVERT(varchar(128), regionUserSendKey), CONVERT(varchar(36), regionMapTexture), CONVERT(int, serverHttpPort), CONVERT(int, serverRemotingPort), owner_uuid FROM regions')
-
-DROP TABLE regions
-
-EXECUTE sp_rename N'Tmp_regions', N'regions', 'OBJECT' 
-
-ALTER TABLE regions ADD CONSTRAINT
-        PK__regions__uuid PRIMARY KEY CLUSTERED 
-        (
-        uuid
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql b/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql
deleted file mode 100644
index bcc26b8..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_InventoryStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE inventoryitems ADD inventoryGroupPermissions INTEGER NOT NULL default 0
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_Presence.sql b/OpenSim/Data/MSSQL/Resources/002_Presence.sql
deleted file mode 100644
index a67671d..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_Presence.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
-CREATE INDEX UserID ON Presence(UserID);
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/002_RegionStore.sql
deleted file mode 100644
index 1801035..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_RegionStore.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE regionban (
-        [regionUUID] VARCHAR(36) NOT NULL, 
-        [bannedUUID] VARCHAR(36) NOT NULL, 
-        [bannedIp] VARCHAR(16) NOT NULL, 
-        [bannedIpHostMask] VARCHAR(16) NOT NULL)
-
-create table [dbo].[regionsettings] (
-        [regionUUID] [varchar](36) not null,
-        [block_terraform] [bit] not null,
-        [block_fly] [bit] not null,
-        [allow_damage] [bit] not null,
-        [restrict_pushing] [bit] not null,
-        [allow_land_resell] [bit] not null,
-        [allow_land_join_divide] [bit] not null,
-        [block_show_in_search] [bit] not null,
-        [agent_limit] [int] not null,
-        [object_bonus] [float] not null,
-        [maturity] [int] not null,
-        [disable_scripts] [bit] not null,
-        [disable_collisions] [bit] not null,
-        [disable_physics] [bit] not null,
-        [terrain_texture_1] [varchar](36) not null,
-        [terrain_texture_2] [varchar](36) not null,
-        [terrain_texture_3] [varchar](36) not null,
-        [terrain_texture_4] [varchar](36) not null,
-        [elevation_1_nw] [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] [bit] not null,
-        [fixed_sun] [bit] not null,
-        [sun_position] [float] not null,
-        [covenant] [varchar](36) default NULL,
-        [Sandbox] [bit] NOT NULL,
-PRIMARY KEY CLUSTERED 
-(
-        [regionUUID] ASC
-)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
-) ON [PRIMARY]
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/002_UserAccount.sql
deleted file mode 100644
index 89d1f34..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_UserAccount.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN TRANSACTION
-
-INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
-username AS FirstName, 
-lastname AS LastName, 
-email as Email, (
-'AssetServerURI=' +  
-userAssetURI + ' InventoryServerURI='  + userInventoryURI + ' GatewayURI= HomeURI=') AS ServiceURLs, 
-created as Created FROM users;
-
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql b/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
deleted file mode 100644
index 402eddf..0000000
--- a/OpenSim/Data/MSSQL/Resources/002_UserStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE users ADD userFlags int NOT NULL default 0;
-ALTER TABLE users ADD godLevel int NOT NULL default 0;
-ALTER TABLE users ADD customType varchar(32) not null default '';
-ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql
deleted file mode 100644
index 1434330..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_AssetStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE assets add create_time integer default 0
-ALTER TABLE assets add access_time integer default 0
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/003_EstateStore.sql
deleted file mode 100644
index 120966a..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_EstateStore.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estateban
-        (
-        EstateID int NOT NULL,
-        bannedUUID varchar(36) NOT NULL,
-        bannedIp varchar(16) NULL,
-        bannedIpHostMask varchar(16) NULL,
-        bannedNameMask varchar(64) NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estateban)
-         EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
-                SELECT EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban')
-
-DROP TABLE dbo.estateban
-
-EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_GridStore.sql b/OpenSim/Data/MSSQL/Resources/003_GridStore.sql
deleted file mode 100644
index e080947..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_GridStore.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
-        (
-        regionName
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
-        (
-        regionHandle
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
-        (
-        eastOverrideHandle,
-        westOverrideHandle,
-        southOverrideHandle,
-        northOverrideHandle
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_InventoryStore.sql b/OpenSim/Data/MSSQL/Resources/003_InventoryStore.sql
deleted file mode 100644
index 2f623ec..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_InventoryStore.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_inventoryfolders
-        (
-        folderID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        agentID uniqueidentifier NULL DEFAULT (NULL),
-        parentFolderID uniqueidentifier NULL DEFAULT (NULL),
-        folderName varchar(64) NULL DEFAULT (NULL),
-        type smallint NOT NULL DEFAULT ((0)),
-        version int NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.inventoryfolders)
-         EXEC('INSERT INTO dbo.Tmp_inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version)
-                SELECT CONVERT(uniqueidentifier, folderID), CONVERT(uniqueidentifier, agentID), CONVERT(uniqueidentifier, parentFolderID), folderName, type, version FROM dbo.inventoryfolders WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.inventoryfolders
-
-EXECUTE sp_rename N'dbo.Tmp_inventoryfolders', N'inventoryfolders', 'OBJECT' 
-
-ALTER TABLE dbo.inventoryfolders ADD CONSTRAINT
-        PK__inventor__C2FABFB3173876EA PRIMARY KEY CLUSTERED 
-        (
-        folderID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX owner ON dbo.inventoryfolders
-        (
-        agentID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX parent ON dbo.inventoryfolders
-        (
-        parentFolderID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/003_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/003_RegionStore.sql
deleted file mode 100644
index a8f40c2..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_RegionStore.sql
+++ /dev/null
@@ -1,67 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_prims
-        (
-        UUID varchar(36) NOT NULL,
-        RegionUUID varchar(36) NULL,
-        ParentID int NULL,
-        CreationDate int NULL,
-        Name varchar(255) NULL,
-        SceneGroupID varchar(36) NULL,
-        Text varchar(255) NULL,
-        Description varchar(255) NULL,
-        SitName varchar(255) NULL,
-        TouchName varchar(255) NULL,
-        ObjectFlags int NULL,
-        CreatorID varchar(36) NULL,
-        OwnerID varchar(36) NULL,
-        GroupID varchar(36) NULL,
-        LastOwnerID varchar(36) NULL,
-        OwnerMask int NULL,
-        NextOwnerMask int NULL,
-        GroupMask int NULL,
-        EveryoneMask int NULL,
-        BaseMask int NULL,
-        PositionX float(53) NULL,
-        PositionY float(53) NULL,
-        PositionZ float(53) NULL,
-        GroupPositionX float(53) NULL,
-        GroupPositionY float(53) NULL,
-        GroupPositionZ float(53) NULL,
-        VelocityX float(53) NULL,
-        VelocityY float(53) NULL,
-        VelocityZ float(53) NULL,
-        AngularVelocityX float(53) NULL,
-        AngularVelocityY float(53) NULL,
-        AngularVelocityZ float(53) NULL,
-        AccelerationX float(53) NULL,
-        AccelerationY float(53) NULL,
-        AccelerationZ float(53) NULL,
-        RotationX float(53) NULL,
-        RotationY float(53) NULL,
-        RotationZ float(53) NULL,
-        RotationW float(53) NULL,
-        SitTargetOffsetX float(53) NULL,
-        SitTargetOffsetY float(53) NULL,
-        SitTargetOffsetZ float(53) NULL,
-        SitTargetOrientW float(53) NULL,
-        SitTargetOrientX float(53) NULL,
-        SitTargetOrientY float(53) NULL,
-        SitTargetOrientZ float(53) NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.prims)
-         EXEC('INSERT INTO dbo.Tmp_prims (UUID, RegionUUID, ParentID, CreationDate, Name, SceneGroupID, Text, Description, SitName, TouchName, ObjectFlags, CreatorID, OwnerID, GroupID, LastOwnerID, OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ)
-                SELECT CONVERT(varchar(36), UUID), CONVERT(varchar(36), RegionUUID), ParentID, CreationDate, Name, CONVERT(varchar(36), SceneGroupID), Text, Description, SitName, TouchName, ObjectFlags, CONVERT(varchar(36), CreatorID), CONVERT(varchar(36), OwnerID), CONVERT(varchar(36), GroupID), CONVERT(varchar(36), LastOwnerID), OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ FROM dbo.prims WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.prims
-
-EXECUTE sp_rename N'dbo.Tmp_prims', N'prims', 'OBJECT' 
-
-ALTER TABLE dbo.prims ADD CONSTRAINT
-        PK__prims__10566F31 PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/003_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/003_UserAccount.sql
deleted file mode 100644
index da0395b..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_UserAccount.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
-CREATE INDEX Email ON UserAccounts(Email);
-CREATE INDEX FirstName ON UserAccounts(FirstName);
-CREATE INDEX LastName ON UserAccounts(LastName);
-CREATE INDEX Name ON UserAccounts(FirstName,LastName);
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql b/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
deleted file mode 100644
index cb507c9..0000000
--- a/OpenSim/Data/MSSQL/Resources/003_UserStore.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE [avatarattachments] (
-        [UUID] varchar(36) NOT NULL
-        , [attachpoint] int NOT NULL
-        , [item] varchar(36) NOT NULL
-        , [asset] varchar(36) NOT NULL)
-
-CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/004_AssetStore.sql
deleted file mode 100644
index 215cf3a..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_AssetStore.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_assets
-        (
-        id uniqueidentifier NOT NULL,
-        name varchar(64) NOT NULL,
-        description varchar(64) NOT NULL,
-        assetType tinyint NOT NULL,
-        local bit NOT NULL,
-        temporary bit NOT NULL,
-        data image NOT NULL,
-        create_time int NULL,
-        access_time int NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.assets)
-         EXEC('INSERT INTO dbo.Tmp_assets (id, name, description, assetType, local, temporary, data, create_time, access_time)
-                SELECT CONVERT(uniqueidentifier, id), name, description, assetType, local, temporary, data, create_time, access_time FROM dbo.assets WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE assets
-
-EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
-
-ALTER TABLE dbo.assets ADD CONSTRAINT
-        PK__assets__id PRIMARY KEY CLUSTERED 
-        (
-        id
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/004_EstateStore.sql
deleted file mode 100644
index 0a132c1..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_EstateStore.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_managers
-        (
-        EstateID int NOT NULL,
-        uuid uniqueidentifier NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_managers)
-         EXEC('INSERT INTO dbo.Tmp_estate_managers (EstateID, uuid)
-                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_managers WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_managers
-
-EXECUTE sp_rename N'dbo.Tmp_estate_managers', N'estate_managers', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_GridStore.sql b/OpenSim/Data/MSSQL/Resources/004_GridStore.sql
deleted file mode 100644
index 6456c95..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_GridStore.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_regions
-        (
-        uuid uniqueidentifier NOT NULL,
-        regionHandle bigint NULL,
-        regionName varchar(20) NULL,
-        regionRecvKey varchar(128) NULL,
-        regionSendKey varchar(128) NULL,
-        regionSecret varchar(128) NULL,
-        regionDataURI varchar(128) NULL,
-        serverIP varchar(64) NULL,
-        serverPort int NULL,
-        serverURI varchar(255) NULL,
-        locX int NULL,
-        locY int NULL,
-        locZ int NULL,
-        eastOverrideHandle bigint NULL,
-        westOverrideHandle bigint NULL,
-        southOverrideHandle bigint NULL,
-        northOverrideHandle bigint NULL,
-        regionAssetURI varchar(255) NULL,
-        regionAssetRecvKey varchar(128) NULL,
-        regionAssetSendKey varchar(128) NULL,
-        regionUserURI varchar(255) NULL,
-        regionUserRecvKey varchar(128) NULL,
-        regionUserSendKey varchar(128) NULL,
-        regionMapTexture uniqueidentifier NULL,
-        serverHttpPort int NULL,
-        serverRemotingPort int NULL,
-        owner_uuid uniqueidentifier NOT NULL,
-        originUUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.regions)
-         EXEC('INSERT INTO dbo.Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID)
-                SELECT CONVERT(uniqueidentifier, uuid), regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, CONVERT(uniqueidentifier, regionMapTexture), serverHttpPort, serverRemotingPort, CONVERT(uniqueidentifier, owner_uuid), CONVERT(uniqueidentifier, originUUID) FROM dbo.regions WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.regions
-
-EXECUTE sp_rename N'dbo.Tmp_regions', N'regions', 'OBJECT' 
-
-ALTER TABLE dbo.regions ADD CONSTRAINT
-        PK__regions__uuid PRIMARY KEY CLUSTERED 
-        (
-        uuid
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
-        (
-        regionName
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
-        (
-        regionHandle
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
-        (
-        eastOverrideHandle,
-        westOverrideHandle,
-        southOverrideHandle,
-        northOverrideHandle
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_InventoryStore.sql b/OpenSim/Data/MSSQL/Resources/004_InventoryStore.sql
deleted file mode 100644
index 96ef1c0..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_InventoryStore.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_inventoryitems
-        (
-        inventoryID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        assetID uniqueidentifier NULL DEFAULT (NULL),
-        assetType int NULL DEFAULT (NULL),
-        parentFolderID uniqueidentifier NULL DEFAULT (NULL),
-        avatarID uniqueidentifier NULL DEFAULT (NULL),
-        inventoryName varchar(64) NULL DEFAULT (NULL),
-        inventoryDescription varchar(128) NULL DEFAULT (NULL),
-        inventoryNextPermissions int NULL DEFAULT (NULL),
-        inventoryCurrentPermissions int NULL DEFAULT (NULL),
-        invType int NULL DEFAULT (NULL),
-        creatorID uniqueidentifier NULL DEFAULT (NULL),
-        inventoryBasePermissions int NOT NULL DEFAULT ((0)),
-        inventoryEveryOnePermissions int NOT NULL DEFAULT ((0)),
-        salePrice int NULL DEFAULT (NULL),
-        saleType tinyint NULL DEFAULT (NULL),
-        creationDate int NULL DEFAULT (NULL),
-        groupID uniqueidentifier NULL DEFAULT (NULL),
-        groupOwned bit NULL DEFAULT (NULL),
-        flags int NULL DEFAULT (NULL),
-        inventoryGroupPermissions int NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.inventoryitems)
-         EXEC('INSERT INTO dbo.Tmp_inventoryitems (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryGroupPermissions)
-                SELECT CONVERT(uniqueidentifier, inventoryID), CONVERT(uniqueidentifier, assetID), assetType, CONVERT(uniqueidentifier, parentFolderID), CONVERT(uniqueidentifier, avatarID), inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, CONVERT(uniqueidentifier, creatorID), inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, CONVERT(uniqueidentifier, groupID), groupOwned, flags, inventoryGroupPermissions FROM dbo.inventoryitems WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.inventoryitems
-
-EXECUTE sp_rename N'dbo.Tmp_inventoryitems', N'inventoryitems', 'OBJECT' 
-
-ALTER TABLE dbo.inventoryitems ADD CONSTRAINT
-        PK__inventor__C4B7BC2220C1E124 PRIMARY KEY CLUSTERED 
-        (
-        inventoryID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX owner ON dbo.inventoryitems
-        (
-        avatarID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX folder ON dbo.inventoryitems
-        (
-        parentFolderID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/004_RegionStore.sql
deleted file mode 100644
index 15b39a7..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_RegionStore.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_primitems
-        (
-        itemID varchar(36) NOT NULL,
-        primID varchar(36) NULL,
-        assetID varchar(36) NULL,
-        parentFolderID varchar(36) NULL,
-        invType int NULL,
-        assetType int NULL,
-        name varchar(255) NULL,
-        description varchar(255) NULL,
-        creationDate varchar(255) NULL,
-        creatorID varchar(36) NULL,
-        ownerID varchar(36) NULL,
-        lastOwnerID varchar(36) NULL,
-        groupID varchar(36) NULL,
-        nextPermissions int NULL,
-        currentPermissions int NULL,
-        basePermissions int NULL,
-        everyonePermissions int NULL,
-        groupPermissions int NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM primitems)
-         EXEC('INSERT INTO Tmp_primitems (itemID, primID, assetID, parentFolderID, invType, assetType, name, description, creationDate, creatorID, ownerID, lastOwnerID, groupID, nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions)
-                SELECT CONVERT(varchar(36), itemID), CONVERT(varchar(36), primID), CONVERT(varchar(36), assetID), CONVERT(varchar(36), parentFolderID), invType, assetType, name, description, creationDate, CONVERT(varchar(36), creatorID), CONVERT(varchar(36), ownerID), CONVERT(varchar(36), lastOwnerID), CONVERT(varchar(36), groupID), nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions')
-
-DROP TABLE primitems
-
-EXECUTE sp_rename N'Tmp_primitems', N'primitems', 'OBJECT' 
-
-ALTER TABLE primitems ADD CONSTRAINT
-        PK__primitems__0A688BB1 PRIMARY KEY CLUSTERED 
-        (
-        itemID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/004_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/004_UserAccount.sql
deleted file mode 100644
index a9a9021..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_UserAccount.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE UserAccounts ADD UserLevel integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD UserFlags integer NOT NULL DEFAULT 0;
-ALTER TABLE UserAccounts ADD UserTitle varchar(64) NOT NULL DEFAULT '';
-
-COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql b/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
deleted file mode 100644
index 08f1a1d..0000000
--- a/OpenSim/Data/MSSQL/Resources/004_UserStore.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_userfriends
-        (
-        ownerID varchar(36) NOT NULL,
-        friendID varchar(36) NOT NULL,
-        friendPerms int NOT NULL,
-        datetimestamp int NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM userfriends)
-         EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
-                SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.userfriends
-
-EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
-        (
-        ownerID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
-        (
-        friendID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/005_AssetStore.sql b/OpenSim/Data/MSSQL/Resources/005_AssetStore.sql
deleted file mode 100644
index 4e95b2b..0000000
--- a/OpenSim/Data/MSSQL/Resources/005_AssetStore.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621';
diff --git a/OpenSim/Data/MSSQL/Resources/005_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/005_EstateStore.sql
deleted file mode 100644
index ba93b39..0000000
--- a/OpenSim/Data/MSSQL/Resources/005_EstateStore.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_groups
-        (
-        EstateID int NOT NULL,
-        uuid uniqueidentifier NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_groups)
-         EXEC('INSERT INTO dbo.Tmp_estate_groups (EstateID, uuid)
-                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_groups WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_groups
-
-EXECUTE sp_rename N'dbo.Tmp_estate_groups', N'estate_groups', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/005_GridStore.sql b/OpenSim/Data/MSSQL/Resources/005_GridStore.sql
deleted file mode 100644
index aa04a33..0000000
--- a/OpenSim/Data/MSSQL/Resources/005_GridStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD access int default 0;
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/005_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/005_RegionStore.sql
deleted file mode 100644
index eb0862c..0000000
--- a/OpenSim/Data/MSSQL/Resources/005_RegionStore.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE Tmp_primshapes
-        (
-        UUID varchar(36) NOT NULL,
-        Shape int NULL,
-        ScaleX float(53) NULL,
-        ScaleY float(53) NULL,
-        ScaleZ float(53) NULL,
-        PCode int NULL,
-        PathBegin int NULL,
-        PathEnd int NULL,
-        PathScaleX int NULL,
-        PathScaleY int NULL,
-        PathShearX int NULL,
-        PathShearY int NULL,
-        PathSkew int NULL,
-        PathCurve int NULL,
-        PathRadiusOffset int NULL,
-        PathRevolutions int NULL,
-        PathTaperX int NULL,
-        PathTaperY int NULL,
-        PathTwist int NULL,
-        PathTwistBegin int NULL,
-        ProfileBegin int NULL,
-        ProfileEnd int NULL,
-        ProfileCurve int NULL,
-        ProfileHollow int NULL,
-        State int NULL,
-        Texture image NULL,
-        ExtraParams image NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM primshapes)
-         EXEC('INSERT INTO Tmp_primshapes (UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams)
-                SELECT CONVERT(varchar(36), UUID), Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams FROM primshapes WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE primshapes
-
-EXECUTE sp_rename N'Tmp_primshapes', N'primshapes', 'OBJECT' 
-
-ALTER TABLE primshapes ADD CONSTRAINT
-        PK__primshapes__0880433F PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/005_UserStore.sql b/OpenSim/Data/MSSQL/Resources/005_UserStore.sql
deleted file mode 100644
index 1b6ab8f..0000000
--- a/OpenSim/Data/MSSQL/Resources/005_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
- ALTER TABLE users add email varchar(250);
- 
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/006_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/006_EstateStore.sql
deleted file mode 100644
index f7df8fd..0000000
--- a/OpenSim/Data/MSSQL/Resources/006_EstateStore.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_users
-        (
-        EstateID int NOT NULL,
-        uuid uniqueidentifier NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_users)
-         EXEC('INSERT INTO dbo.Tmp_estate_users (EstateID, uuid)
-                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_users WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_users
-
-EXECUTE sp_rename N'dbo.Tmp_estate_users', N'estate_users', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/006_GridStore.sql b/OpenSim/Data/MSSQL/Resources/006_GridStore.sql
deleted file mode 100644
index 42010ce..0000000
--- a/OpenSim/Data/MSSQL/Resources/006_GridStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD scopeid uniqueidentifier default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE regions ADD DEFAULT ('00000000-0000-0000-0000-000000000000') FOR [owner_uuid];
-ALTER TABLE regions ADD sizeX integer not null default 0;
-ALTER TABLE regions ADD sizeY integer not null default 0;
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/006_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/006_RegionStore.sql
deleted file mode 100644
index 0419c0c..0000000
--- a/OpenSim/Data/MSSQL/Resources/006_RegionStore.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD PayPrice int not null default 0
-ALTER TABLE prims ADD PayButton1 int not null default 0
-ALTER TABLE prims ADD PayButton2 int not null default 0
-ALTER TABLE prims ADD PayButton3 int not null default 0
-ALTER TABLE prims ADD PayButton4 int not null default 0
-ALTER TABLE prims ADD LoopedSound varchar(36) not null default '00000000-0000-0000-0000-000000000000';
-ALTER TABLE prims ADD LoopedSoundGain float not null default 0.0;
-ALTER TABLE prims ADD TextureAnimation image
-ALTER TABLE prims ADD OmegaX float not null default 0.0
-ALTER TABLE prims ADD OmegaY float not null default 0.0
-ALTER TABLE prims ADD OmegaZ float not null default 0.0
-ALTER TABLE prims ADD CameraEyeOffsetX float not null default 0.0
-ALTER TABLE prims ADD CameraEyeOffsetY float not null default 0.0
-ALTER TABLE prims ADD CameraEyeOffsetZ float not null default 0.0
-ALTER TABLE prims ADD CameraAtOffsetX float not null default 0.0
-ALTER TABLE prims ADD CameraAtOffsetY float not null default 0.0
-ALTER TABLE prims ADD CameraAtOffsetZ float not null default 0.0
-ALTER TABLE prims ADD ForceMouselook tinyint not null default 0
-ALTER TABLE prims ADD ScriptAccessPin int not null default 0
-ALTER TABLE prims ADD AllowedDrop tinyint not null default 0
-ALTER TABLE prims ADD DieAtEdge tinyint not null default 0
-ALTER TABLE prims ADD SalePrice int not null default 10
-ALTER TABLE prims ADD SaleType tinyint not null default 0
-
-ALTER TABLE primitems add flags integer not null default 0
-
-ALTER TABLE land ADD AuthbuyerID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000'
-
-CREATE index prims_regionuuid on prims(RegionUUID)
-CREATE index prims_parentid on prims(ParentID)
-
-CREATE index primitems_primid on primitems(primID)
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/006_UserStore.sql b/OpenSim/Data/MSSQL/Resources/006_UserStore.sql
deleted file mode 100644
index 67fe581..0000000
--- a/OpenSim/Data/MSSQL/Resources/006_UserStore.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_users
-        (
-        UUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        username varchar(32) NOT NULL,
-        lastname varchar(32) NOT NULL,
-        passwordHash varchar(32) NOT NULL,
-        passwordSalt varchar(32) NOT NULL,
-        homeRegion bigint NULL DEFAULT (NULL),
-        homeLocationX float(53) NULL DEFAULT (NULL),
-        homeLocationY float(53) NULL DEFAULT (NULL),
-        homeLocationZ float(53) NULL DEFAULT (NULL),
-        homeLookAtX float(53) NULL DEFAULT (NULL),
-        homeLookAtY float(53) NULL DEFAULT (NULL),
-        homeLookAtZ float(53) NULL DEFAULT (NULL),
-        created int NOT NULL,
-        lastLogin int NOT NULL,
-        userInventoryURI varchar(255) NULL DEFAULT (NULL),
-        userAssetURI varchar(255) NULL DEFAULT (NULL),
-        profileCanDoMask int NULL DEFAULT (NULL),
-        profileWantDoMask int NULL DEFAULT (NULL),
-        profileAboutText ntext NULL,
-        profileFirstText ntext NULL,
-        profileImage uniqueidentifier NULL DEFAULT (NULL),
-        profileFirstImage uniqueidentifier NULL DEFAULT (NULL),
-        webLoginKey uniqueidentifier NULL DEFAULT (NULL),
-        homeRegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        userFlags int NOT NULL DEFAULT ((0)),
-        godLevel int NOT NULL DEFAULT ((0)),
-        customType varchar(32) NOT NULL DEFAULT (''),
-        partner uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        email varchar(250) NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.users)
-         EXEC('INSERT INTO dbo.Tmp_users (UUID, username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, profileImage, profileFirstImage, webLoginKey, homeRegionID, userFlags, godLevel, customType, partner, email)
-                SELECT CONVERT(uniqueidentifier, UUID), username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, CONVERT(uniqueidentifier, profileImage), CONVERT(uniqueidentifier, profileFirstImage), CONVERT(uniqueidentifier, webLoginKey), CONVERT(uniqueidentifier, homeRegionID), userFlags, godLevel, customType, CONVERT(uniqueidentifier, partner), email FROM dbo.users WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.users
-
-EXECUTE sp_rename N'dbo.Tmp_users', N'users', 'OBJECT' 
-
-ALTER TABLE dbo.users ADD CONSTRAINT
-        PK__users__65A475E737A5467C PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX usernames ON dbo.users
-        (
-        username,
-        lastname
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/007_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/007_EstateStore.sql
deleted file mode 100644
index c9165b0..0000000
--- a/OpenSim/Data/MSSQL/Resources/007_EstateStore.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estateban
-        (
-        EstateID int NOT NULL,
-        bannedUUID uniqueidentifier NOT NULL,
-        bannedIp varchar(16) NULL,
-        bannedIpHostMask varchar(16) NULL,
-        bannedNameMask varchar(64) NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estateban)
-         EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
-                SELECT EstateID, CONVERT(uniqueidentifier, bannedUUID), bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estateban
-
-EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/007_GridStore.sql b/OpenSim/Data/MSSQL/Resources/007_GridStore.sql
deleted file mode 100644
index 0b66d40..0000000
--- a/OpenSim/Data/MSSQL/Resources/007_GridStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regions ADD [flags] integer NOT NULL DEFAULT 0;
-CREATE INDEX [flags] ON regions(flags);
-ALTER TABLE [regions] ADD [last_seen] integer NOT NULL DEFAULT 0;
-ALTER TABLE [regions] ADD [PrincipalID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0;
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/007_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/007_RegionStore.sql
deleted file mode 100644
index 684f937..0000000
--- a/OpenSim/Data/MSSQL/Resources/007_RegionStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD ColorR int not null default 0;
-ALTER TABLE prims ADD ColorG int not null default 0;
-ALTER TABLE prims ADD ColorB int not null default 0;
-ALTER TABLE prims ADD ColorA int not null default 0;
-ALTER TABLE prims ADD ParticleSystem IMAGE;
-ALTER TABLE prims ADD ClickAction tinyint NOT NULL default 0;
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/007_UserStore.sql b/OpenSim/Data/MSSQL/Resources/007_UserStore.sql
deleted file mode 100644
index 92a8fc5..0000000
--- a/OpenSim/Data/MSSQL/Resources/007_UserStore.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_agents
-        (
-        UUID uniqueidentifier NOT NULL,
-        sessionID uniqueidentifier NOT NULL,
-        secureSessionID uniqueidentifier NOT NULL,
-        agentIP varchar(16) NOT NULL,
-        agentPort int NOT NULL,
-        agentOnline tinyint NOT NULL,
-        loginTime int NOT NULL,
-        logoutTime int NOT NULL,
-        currentRegion uniqueidentifier NOT NULL,
-        currentHandle bigint NOT NULL,
-        currentPos varchar(64) NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.agents)
-         EXEC('INSERT INTO dbo.Tmp_agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos)
-                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, sessionID), CONVERT(uniqueidentifier, secureSessionID), agentIP, agentPort, agentOnline, loginTime, logoutTime, CONVERT(uniqueidentifier, currentRegion), currentHandle, currentPos FROM dbo.agents WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.agents
-
-EXECUTE sp_rename N'dbo.Tmp_agents', N'agents', 'OBJECT' 
-
-ALTER TABLE dbo.agents ADD CONSTRAINT
-        PK__agents__65A475E749C3F6B7 PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX session ON dbo.agents
-        (
-        sessionID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX ssession ON dbo.agents
-        (
-        secureSessionID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/008_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/008_EstateStore.sql
deleted file mode 100644
index 9c5355e..0000000
--- a/OpenSim/Data/MSSQL/Resources/008_EstateStore.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_settings
-        (
-        EstateID int NOT NULL IDENTITY (1, 100),
-        EstateName varchar(64) NULL DEFAULT (NULL),
-        AbuseEmailToEstateOwner bit NOT NULL,
-        DenyAnonymous bit NOT NULL,
-        ResetHomeOnTeleport bit NOT NULL,
-        FixedSun bit NOT NULL,
-        DenyTransacted bit NOT NULL,
-        BlockDwell bit NOT NULL,
-        DenyIdentified bit NOT NULL,
-        AllowVoice bit NOT NULL,
-        UseGlobalTime bit NOT NULL,
-        PricePerMeter int NOT NULL,
-        TaxFree bit NOT NULL,
-        AllowDirectTeleport bit NOT NULL,
-        RedirectGridX int NOT NULL,
-        RedirectGridY int NOT NULL,
-        ParentEstateID int NOT NULL,
-        SunPosition float(53) NOT NULL,
-        EstateSkipScripts bit NOT NULL,
-        BillableFactor float(53) NOT NULL,
-        PublicAccess bit NOT NULL,
-        AbuseEmail varchar(255) NOT NULL,
-        EstateOwner uniqueidentifier NOT NULL,
-        DenyMinors bit NOT NULL
-        )  ON [PRIMARY]
-
-SET IDENTITY_INSERT dbo.Tmp_estate_settings ON
-
-IF EXISTS(SELECT * FROM dbo.estate_settings)
-         EXEC('INSERT INTO dbo.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, CONVERT(uniqueidentifier, EstateOwner), DenyMinors FROM dbo.estate_settings WITH (HOLDLOCK TABLOCKX)')
-
-SET IDENTITY_INSERT dbo.Tmp_estate_settings OFF
-
-DROP TABLE dbo.estate_settings
-
-EXECUTE sp_rename N'dbo.Tmp_estate_settings', N'estate_settings', 'OBJECT' 
-
-ALTER TABLE dbo.estate_settings ADD CONSTRAINT
-        PK_estate_settings PRIMARY KEY CLUSTERED 
-        (
-        EstateID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/008_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/008_RegionStore.sql
deleted file mode 100644
index 87d6d80..0000000
--- a/OpenSim/Data/MSSQL/Resources/008_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE land ADD OtherCleanTime integer NOT NULL default 0;
-ALTER TABLE land ADD Dwell integer NOT NULL default 0;
-
-COMMIT
-
diff --git a/OpenSim/Data/MSSQL/Resources/008_UserStore.sql b/OpenSim/Data/MSSQL/Resources/008_UserStore.sql
deleted file mode 100644
index 505252b..0000000
--- a/OpenSim/Data/MSSQL/Resources/008_UserStore.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_userfriends
-        (
-        ownerID uniqueidentifier NOT NULL,
-        friendID uniqueidentifier NOT NULL,
-        friendPerms int NOT NULL,
-        datetimestamp int NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.userfriends)
-         EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
-                SELECT CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, friendID), friendPerms, datetimestamp FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.userfriends
-
-EXECUTE sp_rename N'dbo.Tmp_userfriends', N'userfriends', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON dbo.userfriends
-        (
-        ownerID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON dbo.userfriends
-        (
-        friendID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/009_EstateStore.sql b/OpenSim/Data/MSSQL/Resources/009_EstateStore.sql
deleted file mode 100644
index f91557c..0000000
--- a/OpenSim/Data/MSSQL/Resources/009_EstateStore.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_estate_map
-        (
-        RegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        EstateID int NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.estate_map)
-         EXEC('INSERT INTO dbo.Tmp_estate_map (RegionID, EstateID)
-                SELECT CONVERT(uniqueidentifier, RegionID), EstateID FROM dbo.estate_map WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.estate_map
-
-EXECUTE sp_rename N'dbo.Tmp_estate_map', N'estate_map', 'OBJECT' 
-
-ALTER TABLE dbo.estate_map ADD CONSTRAINT
-        PK_estate_map PRIMARY KEY CLUSTERED 
-        (
-        RegionID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
deleted file mode 100644
index 4ef3b3f..0000000
--- a/OpenSim/Data/MSSQL/Resources/009_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD Material tinyint NOT NULL default 3
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/009_UserStore.sql b/OpenSim/Data/MSSQL/Resources/009_UserStore.sql
deleted file mode 100644
index b1ab8ba..0000000
--- a/OpenSim/Data/MSSQL/Resources/009_UserStore.sql
+++ /dev/null
@@ -1,53 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_avatarappearance
-        (
-        Owner uniqueidentifier NOT NULL,
-        Serial int NOT NULL,
-        Visual_Params image NOT NULL,
-        Texture image NOT NULL,
-        Avatar_Height float(53) NOT NULL,
-        Body_Item uniqueidentifier NOT NULL,
-        Body_Asset uniqueidentifier NOT NULL,
-        Skin_Item uniqueidentifier NOT NULL,
-        Skin_Asset uniqueidentifier NOT NULL,
-        Hair_Item uniqueidentifier NOT NULL,
-        Hair_Asset uniqueidentifier NOT NULL,
-        Eyes_Item uniqueidentifier NOT NULL,
-        Eyes_Asset uniqueidentifier NOT NULL,
-        Shirt_Item uniqueidentifier NOT NULL,
-        Shirt_Asset uniqueidentifier NOT NULL,
-        Pants_Item uniqueidentifier NOT NULL,
-        Pants_Asset uniqueidentifier NOT NULL,
-        Shoes_Item uniqueidentifier NOT NULL,
-        Shoes_Asset uniqueidentifier NOT NULL,
-        Socks_Item uniqueidentifier NOT NULL,
-        Socks_Asset uniqueidentifier NOT NULL,
-        Jacket_Item uniqueidentifier NOT NULL,
-        Jacket_Asset uniqueidentifier NOT NULL,
-        Gloves_Item uniqueidentifier NOT NULL,
-        Gloves_Asset uniqueidentifier NOT NULL,
-        Undershirt_Item uniqueidentifier NOT NULL,
-        Undershirt_Asset uniqueidentifier NOT NULL,
-        Underpants_Item uniqueidentifier NOT NULL,
-        Underpants_Asset uniqueidentifier NOT NULL,
-        Skirt_Item uniqueidentifier NOT NULL,
-        Skirt_Asset uniqueidentifier NOT NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.avatarappearance)
-         EXEC('INSERT INTO dbo.Tmp_avatarappearance (Owner, Serial, Visual_Params, Texture, Avatar_Height, Body_Item, Body_Asset, Skin_Item, Skin_Asset, Hair_Item, Hair_Asset, Eyes_Item, Eyes_Asset, Shirt_Item, Shirt_Asset, Pants_Item, Pants_Asset, Shoes_Item, Shoes_Asset, Socks_Item, Socks_Asset, Jacket_Item, Jacket_Asset, Gloves_Item, Gloves_Asset, Undershirt_Item, Undershirt_Asset, Underpants_Item, Underpants_Asset, Skirt_Item, Skirt_Asset)
-                SELECT CONVERT(uniqueidentifier, Owner), Serial, Visual_Params, Texture, Avatar_Height, CONVERT(uniqueidentifier, Body_Item), CONVERT(uniqueidentifier, Body_Asset), CONVERT(uniqueidentifier, Skin_Item), CONVERT(uniqueidentifier, Skin_Asset), CONVERT(uniqueidentifier, Hair_Item), CONVERT(uniqueidentifier, Hair_Asset), CONVERT(uniqueidentifier, Eyes_Item), CONVERT(uniqueidentifier, Eyes_Asset), CONVERT(uniqueidentifier, Shirt_Item), CONVERT(uniqueidentifier, Shirt_Asset), CONVERT(uniqueidentifier, Pants_Item), CONVERT(uniqueidentifier, Pants_Asset), CONVERT(uniqueidentifier, Shoes_Item), CONVERT(uniqueidentifier, Shoes_Asset), CONVERT(uniqueidentifier, Socks_Item), CONVERT(uniqueidentifier, Socks_Asset), CONVERT(uniqueidentifier, Jacket_Item), CONVERT(uniqueidentifier, Jacket_Asset), CONVERT(uniqueidentifier, Gloves_Item), CONVERT(uniqueidentifier, Gloves_Asset), CONVERT(uniqueidentifier, Undershirt_Item), CONVERT(uniqueidentifier, Undershirt_Asset), CONVERT(uniqueidentifier, Underpants_Item), CONVERT(uniqueidentifier, Underpants_Asset), CONVERT(uniqueidentifier, Skirt_Item), CONVERT(uniqueidentifier, Skirt_Asset) FROM dbo.avatarappearance WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.avatarappearance
-
-EXECUTE sp_rename N'dbo.Tmp_avatarappearance', N'avatarappearance', 'OBJECT' 
-
-ALTER TABLE dbo.avatarappearance ADD CONSTRAINT
-        PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY CLUSTERED 
-        (
-        Owner
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql
deleted file mode 100644
index 74ad9c2..0000000
--- a/OpenSim/Data/MSSQL/Resources/010_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0;
-ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0;
-ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0;
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/010_UserStore.sql b/OpenSim/Data/MSSQL/Resources/010_UserStore.sql
deleted file mode 100644
index 0af008a..0000000
--- a/OpenSim/Data/MSSQL/Resources/010_UserStore.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_avatarattachments
-        (
-        UUID uniqueidentifier NOT NULL,
-        attachpoint int NOT NULL,
-        item uniqueidentifier NOT NULL,
-        asset uniqueidentifier NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.avatarattachments)
-         EXEC('INSERT INTO dbo.Tmp_avatarattachments (UUID, attachpoint, item, asset)
-                SELECT CONVERT(uniqueidentifier, UUID), attachpoint, CONVERT(uniqueidentifier, item), CONVERT(uniqueidentifier, asset) FROM dbo.avatarattachments WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.avatarattachments
-
-EXECUTE sp_rename N'dbo.Tmp_avatarattachments', N'avatarattachments', 'OBJECT' 
-
-CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql
deleted file mode 100644
index 14c71a3..0000000
--- a/OpenSim/Data/MSSQL/Resources/011_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'
-ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/011_UserStore.sql b/OpenSim/Data/MSSQL/Resources/011_UserStore.sql
deleted file mode 100644
index 5aa064f..0000000
--- a/OpenSim/Data/MSSQL/Resources/011_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE users ADD scopeID uniqueidentifier not null default '00000000-0000-0000-0000-000000000000'
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/012_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/012_RegionStore.sql
deleted file mode 100644
index eef8d90..0000000
--- a/OpenSim/Data/MSSQL/Resources/012_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD LinkNumber integer not null default 0
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/013_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/013_RegionStore.sql
deleted file mode 100644
index ef5d4c0..0000000
--- a/OpenSim/Data/MSSQL/Resources/013_RegionStore.sql
+++ /dev/null
@@ -1,112 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_prims
-        (
-        UUID uniqueidentifier NOT NULL,
-        RegionUUID uniqueidentifier NULL,
-        ParentID int NULL,
-        CreationDate int NULL,
-        Name varchar(255) NULL,
-        SceneGroupID uniqueidentifier NULL,
-        Text varchar(255) NULL,
-        Description varchar(255) NULL,
-        SitName varchar(255) NULL,
-        TouchName varchar(255) NULL,
-        ObjectFlags int NULL,
-        CreatorID uniqueidentifier NULL,
-        OwnerID uniqueidentifier NULL,
-        GroupID uniqueidentifier NULL,
-        LastOwnerID uniqueidentifier NULL,
-        OwnerMask int NULL,
-        NextOwnerMask int NULL,
-        GroupMask int NULL,
-        EveryoneMask int NULL,
-        BaseMask int NULL,
-        PositionX float(53) NULL,
-        PositionY float(53) NULL,
-        PositionZ float(53) NULL,
-        GroupPositionX float(53) NULL,
-        GroupPositionY float(53) NULL,
-        GroupPositionZ float(53) NULL,
-        VelocityX float(53) NULL,
-        VelocityY float(53) NULL,
-        VelocityZ float(53) NULL,
-        AngularVelocityX float(53) NULL,
-        AngularVelocityY float(53) NULL,
-        AngularVelocityZ float(53) NULL,
-        AccelerationX float(53) NULL,
-        AccelerationY float(53) NULL,
-        AccelerationZ float(53) NULL,
-        RotationX float(53) NULL,
-        RotationY float(53) NULL,
-        RotationZ float(53) NULL,
-        RotationW float(53) NULL,
-        SitTargetOffsetX float(53) NULL,
-        SitTargetOffsetY float(53) NULL,
-        SitTargetOffsetZ float(53) NULL,
-        SitTargetOrientW float(53) NULL,
-        SitTargetOrientX float(53) NULL,
-        SitTargetOrientY float(53) NULL,
-        SitTargetOrientZ float(53) NULL,
-        PayPrice int NOT NULL DEFAULT ((0)),
-        PayButton1 int NOT NULL DEFAULT ((0)),
-        PayButton2 int NOT NULL DEFAULT ((0)),
-        PayButton3 int NOT NULL DEFAULT ((0)),
-        PayButton4 int NOT NULL DEFAULT ((0)),
-        LoopedSound uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        LoopedSoundGain float(53) NOT NULL DEFAULT ((0.0)),
-        TextureAnimation image NULL,
-        OmegaX float(53) NOT NULL DEFAULT ((0.0)),
-        OmegaY float(53) NOT NULL DEFAULT ((0.0)),
-        OmegaZ float(53) NOT NULL DEFAULT ((0.0)),
-        CameraEyeOffsetX float(53) NOT NULL DEFAULT ((0.0)),
-        CameraEyeOffsetY float(53) NOT NULL DEFAULT ((0.0)),
-        CameraEyeOffsetZ float(53) NOT NULL DEFAULT ((0.0)),
-        CameraAtOffsetX float(53) NOT NULL DEFAULT ((0.0)),
-        CameraAtOffsetY float(53) NOT NULL DEFAULT ((0.0)),
-        CameraAtOffsetZ float(53) NOT NULL DEFAULT ((0.0)),
-        ForceMouselook tinyint NOT NULL DEFAULT ((0)),
-        ScriptAccessPin int NOT NULL DEFAULT ((0)),
-        AllowedDrop tinyint NOT NULL DEFAULT ((0)),
-        DieAtEdge tinyint NOT NULL DEFAULT ((0)),
-        SalePrice int NOT NULL DEFAULT ((10)),
-        SaleType tinyint NOT NULL DEFAULT ((0)),
-        ColorR int NOT NULL DEFAULT ((0)),
-        ColorG int NOT NULL DEFAULT ((0)),
-        ColorB int NOT NULL DEFAULT ((0)),
-        ColorA int NOT NULL DEFAULT ((0)),
-        ParticleSystem image NULL,
-        ClickAction tinyint NOT NULL DEFAULT ((0)),
-        Material tinyint NOT NULL DEFAULT ((3)),
-        CollisionSound uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        CollisionSoundVolume float(53) NOT NULL DEFAULT ((0.0)),
-        LinkNumber int NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.prims)
-         EXEC('INSERT INTO dbo.Tmp_prims (UUID, RegionUUID, ParentID, CreationDate, Name, SceneGroupID, Text, Description, SitName, TouchName, ObjectFlags, CreatorID, OwnerID, GroupID, LastOwnerID, OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ, PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, LinkNumber)
-                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, RegionUUID), ParentID, CreationDate, Name, CONVERT(uniqueidentifier, SceneGroupID), Text, Description, SitName, TouchName, ObjectFlags, CONVERT(uniqueidentifier, CreatorID), CONVERT(uniqueidentifier, OwnerID), CONVERT(uniqueidentifier, GroupID), CONVERT(uniqueidentifier, LastOwnerID), OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ, PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, CollisionSound), CollisionSoundVolume, LinkNumber FROM dbo.prims WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.prims
-
-EXECUTE sp_rename N'dbo.Tmp_prims', N'prims', 'OBJECT' 
-
-ALTER TABLE dbo.prims ADD CONSTRAINT
-        PK__prims__10566F31 PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-
-CREATE NONCLUSTERED INDEX prims_regionuuid ON dbo.prims
-        (
-        RegionUUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX prims_parentid ON dbo.prims
-        (
-        ParentID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/014_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/014_RegionStore.sql
deleted file mode 100644
index 02f6f55..0000000
--- a/OpenSim/Data/MSSQL/Resources/014_RegionStore.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_primshapes
-        (
-        UUID uniqueidentifier NOT NULL,
-        Shape int NULL,
-        ScaleX float(53) NULL,
-        ScaleY float(53) NULL,
-        ScaleZ float(53) NULL,
-        PCode int NULL,
-        PathBegin int NULL,
-        PathEnd int NULL,
-        PathScaleX int NULL,
-        PathScaleY int NULL,
-        PathShearX int NULL,
-        PathShearY int NULL,
-        PathSkew int NULL,
-        PathCurve int NULL,
-        PathRadiusOffset int NULL,
-        PathRevolutions int NULL,
-        PathTaperX int NULL,
-        PathTaperY int NULL,
-        PathTwist int NULL,
-        PathTwistBegin int NULL,
-        ProfileBegin int NULL,
-        ProfileEnd int NULL,
-        ProfileCurve int NULL,
-        ProfileHollow int NULL,
-        State int NULL,
-        Texture image NULL,
-        ExtraParams image NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.primshapes)
-         EXEC('INSERT INTO dbo.Tmp_primshapes (UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams)
-                SELECT CONVERT(uniqueidentifier, UUID), Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams FROM dbo.primshapes WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.primshapes
-
-EXECUTE sp_rename N'dbo.Tmp_primshapes', N'primshapes', 'OBJECT' 
-
-ALTER TABLE dbo.primshapes ADD CONSTRAINT
-        PK__primshapes__0880433F PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/015_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/015_RegionStore.sql
deleted file mode 100644
index cbaaf88..0000000
--- a/OpenSim/Data/MSSQL/Resources/015_RegionStore.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_primitems
-        (
-        itemID uniqueidentifier NOT NULL,
-        primID uniqueidentifier NULL,
-        assetID uniqueidentifier NULL,
-        parentFolderID uniqueidentifier NULL,
-        invType int NULL,
-        assetType int NULL,
-        name varchar(255) NULL,
-        description varchar(255) NULL,
-        creationDate varchar(255) NULL,
-        creatorID uniqueidentifier NULL,
-        ownerID uniqueidentifier NULL,
-        lastOwnerID uniqueidentifier NULL,
-        groupID uniqueidentifier NULL,
-        nextPermissions int NULL,
-        currentPermissions int NULL,
-        basePermissions int NULL,
-        everyonePermissions int NULL,
-        groupPermissions int NULL,
-        flags int NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.primitems)
-         EXEC('INSERT INTO dbo.Tmp_primitems (itemID, primID, assetID, parentFolderID, invType, assetType, name, description, creationDate, creatorID, ownerID, lastOwnerID, groupID, nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions, flags)
-                SELECT CONVERT(uniqueidentifier, itemID), CONVERT(uniqueidentifier, primID), CONVERT(uniqueidentifier, assetID), CONVERT(uniqueidentifier, parentFolderID), invType, assetType, name, description, creationDate, CONVERT(uniqueidentifier, creatorID), CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, lastOwnerID), CONVERT(uniqueidentifier, groupID), nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions, flags FROM dbo.primitems WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.primitems
-
-EXECUTE sp_rename N'dbo.Tmp_primitems', N'primitems', 'OBJECT' 
-
-ALTER TABLE dbo.primitems ADD CONSTRAINT
-        PK__primitems__0A688BB1 PRIMARY KEY CLUSTERED 
-        (
-        itemID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-CREATE NONCLUSTERED INDEX primitems_primid ON dbo.primitems
-        (
-        primID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/016_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/016_RegionStore.sql
deleted file mode 100644
index e91da19..0000000
--- a/OpenSim/Data/MSSQL/Resources/016_RegionStore.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_terrain
-        (
-        RegionUUID uniqueidentifier NULL,
-        Revision int NULL,
-        Heightfield image NULL
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.terrain)
-         EXEC('INSERT INTO dbo.Tmp_terrain (RegionUUID, Revision, Heightfield)
-                SELECT CONVERT(uniqueidentifier, RegionUUID), Revision, Heightfield FROM dbo.terrain WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.terrain
-
-EXECUTE sp_rename N'dbo.Tmp_terrain', N'terrain', 'OBJECT' 
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/017_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/017_RegionStore.sql
deleted file mode 100644
index 3d3dbc0..0000000
--- a/OpenSim/Data/MSSQL/Resources/017_RegionStore.sql
+++ /dev/null
@@ -1,56 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_land
-        (
-        UUID uniqueidentifier NOT NULL,
-        RegionUUID uniqueidentifier NULL,
-        LocalLandID int NULL,
-        Bitmap image NULL,
-        Name varchar(255) NULL,
-        Description varchar(255) NULL,
-        OwnerUUID uniqueidentifier NULL,
-        IsGroupOwned int NULL,
-        Area int NULL,
-        AuctionID int NULL,
-        Category int NULL,
-        ClaimDate int NULL,
-        ClaimPrice int NULL,
-        GroupUUID uniqueidentifier NULL,
-        SalePrice int NULL,
-        LandStatus int NULL,
-        LandFlags int NULL,
-        LandingType int NULL,
-        MediaAutoScale int NULL,
-        MediaTextureUUID uniqueidentifier NULL,
-        MediaURL varchar(255) NULL,
-        MusicURL varchar(255) NULL,
-        PassHours float(53) NULL,
-        PassPrice int NULL,
-        SnapshotUUID uniqueidentifier NULL,
-        UserLocationX float(53) NULL,
-        UserLocationY float(53) NULL,
-        UserLocationZ float(53) NULL,
-        UserLookAtX float(53) NULL,
-        UserLookAtY float(53) NULL,
-        UserLookAtZ float(53) NULL,
-        AuthbuyerID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
-        OtherCleanTime int NOT NULL DEFAULT ((0)),
-        Dwell int NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-         TEXTIMAGE_ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.land)
-         EXEC('INSERT INTO dbo.Tmp_land (UUID, RegionUUID, LocalLandID, Bitmap, Name, Description, OwnerUUID, IsGroupOwned, Area, AuctionID, Category, ClaimDate, ClaimPrice, GroupUUID, SalePrice, LandStatus, LandFlags, LandingType, MediaAutoScale, MediaTextureUUID, MediaURL, MusicURL, PassHours, PassPrice, SnapshotUUID, UserLocationX, UserLocationY, UserLocationZ, UserLookAtX, UserLookAtY, UserLookAtZ, AuthbuyerID, OtherCleanTime, Dwell)
-                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, RegionUUID), LocalLandID, Bitmap, Name, Description, CONVERT(uniqueidentifier, OwnerUUID), IsGroupOwned, Area, AuctionID, Category, ClaimDate, ClaimPrice, CONVERT(uniqueidentifier, GroupUUID), SalePrice, LandStatus, LandFlags, LandingType, MediaAutoScale, CONVERT(uniqueidentifier, MediaTextureUUID), MediaURL, MusicURL, PassHours, PassPrice, CONVERT(uniqueidentifier, SnapshotUUID), UserLocationX, UserLocationY, UserLocationZ, UserLookAtX, UserLookAtY, UserLookAtZ, CONVERT(uniqueidentifier, AuthbuyerID), OtherCleanTime, Dwell FROM dbo.land WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.land
-
-EXECUTE sp_rename N'dbo.Tmp_land', N'land', 'OBJECT' 
-
-ALTER TABLE dbo.land ADD CONSTRAINT
-        PK__land__65A475E71BFD2C07 PRIMARY KEY CLUSTERED 
-        (
-        UUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/018_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/018_RegionStore.sql
deleted file mode 100644
index 6157e35..0000000
--- a/OpenSim/Data/MSSQL/Resources/018_RegionStore.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_landaccesslist
-        (
-        LandUUID uniqueidentifier NULL,
-        AccessUUID uniqueidentifier NULL,
-        Flags int NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.landaccesslist)
-         EXEC('INSERT INTO dbo.Tmp_landaccesslist (LandUUID, AccessUUID, Flags)
-                SELECT CONVERT(uniqueidentifier, LandUUID), CONVERT(uniqueidentifier, AccessUUID), Flags FROM dbo.landaccesslist WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.landaccesslist
-
-EXECUTE sp_rename N'dbo.Tmp_landaccesslist', N'landaccesslist', 'OBJECT' 
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/019_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/019_RegionStore.sql
deleted file mode 100644
index 8e613b9..0000000
--- a/OpenSim/Data/MSSQL/Resources/019_RegionStore.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_regionban
-        (
-        regionUUID uniqueidentifier NOT NULL,
-        bannedUUID uniqueidentifier NOT NULL,
-        bannedIp varchar(16) NOT NULL,
-        bannedIpHostMask varchar(16) NOT NULL
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.regionban)
-         EXEC('INSERT INTO dbo.Tmp_regionban (regionUUID, bannedUUID, bannedIp, bannedIpHostMask)
-                SELECT CONVERT(uniqueidentifier, regionUUID), CONVERT(uniqueidentifier, bannedUUID), bannedIp, bannedIpHostMask FROM dbo.regionban WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.regionban
-
-EXECUTE sp_rename N'dbo.Tmp_regionban', N'regionban', 'OBJECT' 
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/020_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/020_RegionStore.sql
deleted file mode 100644
index 2ce91f6..0000000
--- a/OpenSim/Data/MSSQL/Resources/020_RegionStore.sql
+++ /dev/null
@@ -1,58 +0,0 @@
-BEGIN TRANSACTION
-
-CREATE TABLE dbo.Tmp_regionsettings
-        (
-        regionUUID uniqueidentifier NOT NULL,
-        block_terraform bit NOT NULL,
-        block_fly bit NOT NULL,
-        allow_damage bit NOT NULL,
-        restrict_pushing bit NOT NULL,
-        allow_land_resell bit NOT NULL,
-        allow_land_join_divide bit NOT NULL,
-        block_show_in_search bit NOT NULL,
-        agent_limit int NOT NULL,
-        object_bonus float(53) NOT NULL,
-        maturity int NOT NULL,
-        disable_scripts bit NOT NULL,
-        disable_collisions bit NOT NULL,
-        disable_physics bit NOT NULL,
-        terrain_texture_1 uniqueidentifier NOT NULL,
-        terrain_texture_2 uniqueidentifier NOT NULL,
-        terrain_texture_3 uniqueidentifier NOT NULL,
-        terrain_texture_4 uniqueidentifier NOT NULL,
-        elevation_1_nw float(53) NOT NULL,
-        elevation_2_nw float(53) NOT NULL,
-        elevation_1_ne float(53) NOT NULL,
-        elevation_2_ne float(53) NOT NULL,
-        elevation_1_se float(53) NOT NULL,
-        elevation_2_se float(53) NOT NULL,
-        elevation_1_sw float(53) NOT NULL,
-        elevation_2_sw float(53) NOT NULL,
-        water_height float(53) NOT NULL,
-        terrain_raise_limit float(53) NOT NULL,
-        terrain_lower_limit float(53) NOT NULL,
-        use_estate_sun bit NOT NULL,
-        fixed_sun bit NOT NULL,
-        sun_position float(53) NOT NULL,
-        covenant uniqueidentifier NULL DEFAULT (NULL),
-        Sandbox bit NOT NULL,
-        sunvectorx float(53) NOT NULL DEFAULT ((0)),
-        sunvectory float(53) NOT NULL DEFAULT ((0)),
-        sunvectorz float(53) NOT NULL DEFAULT ((0))
-        )  ON [PRIMARY]
-
-IF EXISTS(SELECT * FROM dbo.regionsettings)
-         EXEC('INSERT INTO dbo.Tmp_regionsettings (regionUUID, block_terraform, block_fly, allow_damage, restrict_pushing, allow_land_resell, allow_land_join_divide, block_show_in_search, agent_limit, object_bonus, maturity, disable_scripts, disable_collisions, disable_physics, terrain_texture_1, terrain_texture_2, terrain_texture_3, terrain_texture_4, elevation_1_nw, elevation_2_nw, elevation_1_ne, elevation_2_ne, elevation_1_se, elevation_2_se, elevation_1_sw, elevation_2_sw, water_height, terrain_raise_limit, terrain_lower_limit, use_estate_sun, fixed_sun, sun_position, covenant, Sandbox, sunvectorx, sunvectory, sunvectorz)
-                SELECT CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, terrain_texture_1), CONVERT(uniqueidentifier, terrain_texture_2), CONVERT(uniqueidentifier, terrain_texture_3), CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, covenant), Sandbox, sunvectorx, sunvectory, sunvectorz FROM dbo.regionsettings WITH (HOLDLOCK TABLOCKX)')
-
-DROP TABLE dbo.regionsettings
-
-EXECUTE sp_rename N'dbo.Tmp_regionsettings', N'regionsettings', 'OBJECT' 
-
-ALTER TABLE dbo.regionsettings ADD CONSTRAINT
-        PK__regionse__5B35159D21B6055D PRIMARY KEY CLUSTERED 
-        (
-        regionUUID
-        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/021_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/021_RegionStore.sql
deleted file mode 100644
index ac59182..0000000
--- a/OpenSim/Data/MSSQL/Resources/021_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE prims ADD PassTouches bit not null default 0
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/022_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/022_RegionStore.sql
deleted file mode 100644
index 421e8d3..0000000
--- a/OpenSim/Data/MSSQL/Resources/022_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regionsettings ADD loaded_creation_date varchar(20) 
-ALTER TABLE regionsettings ADD loaded_creation_time varchar(20) 
-ALTER TABLE regionsettings ADD loaded_creation_id varchar(64) 
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql b/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql
deleted file mode 100644
index 75a16f3..0000000
--- a/OpenSim/Data/MSSQL/Resources/023_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN TRANSACTION
-
-ALTER TABLE regionsettings DROP COLUMN loaded_creation_date
-ALTER TABLE regionsettings DROP COLUMN loaded_creation_time
-ALTER TABLE regionsettings ADD loaded_creation_datetime int NOT NULL default 0
-
-COMMIT
diff --git a/OpenSim/Data/MSSQL/Resources/AssetStore.migrations b/OpenSim/Data/MSSQL/Resources/AssetStore.migrations
new file mode 100644
index 0000000..beb82b9
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/AssetStore.migrations
@@ -0,0 +1,100 @@
+:VERSION 1
+
+CREATE TABLE [assets] (
+  [id] [varchar](36) NOT NULL,
+  [name] [varchar](64) NOT NULL,
+  [description] [varchar](64) NOT NULL,
+  [assetType] [tinyint] NOT NULL,
+  [local] [tinyint] NOT NULL,
+  [temporary] [tinyint] NOT NULL,
+  [data] [image] NOT NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [id] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_assets
+        (
+        id varchar(36) NOT NULL,
+        name varchar(64) NOT NULL,
+        description varchar(64) NOT NULL,
+        assetType tinyint NOT NULL,
+        local bit NOT NULL,
+        temporary bit NOT NULL,
+        data image NOT NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM assets)
+         EXEC('INSERT INTO Tmp_assets (id, name, description, assetType, local, temporary, data)
+                SELECT id, name, description, assetType, CONVERT(bit, local), CONVERT(bit, temporary), data FROM assets WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE assets
+
+EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
+
+ALTER TABLE dbo.assets ADD CONSTRAINT
+        PK__assets__id PRIMARY KEY CLUSTERED 
+        (
+        id
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+ALTER TABLE assets add create_time integer default 0
+ALTER TABLE assets add access_time integer default 0
+
+COMMIT
+
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_assets
+        (
+        id uniqueidentifier NOT NULL,
+        name varchar(64) NOT NULL,
+        description varchar(64) NOT NULL,
+        assetType tinyint NOT NULL,
+        local bit NOT NULL,
+        temporary bit NOT NULL,
+        data image NOT NULL,
+        create_time int NULL,
+        access_time int NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.assets)
+         EXEC('INSERT INTO dbo.Tmp_assets (id, name, description, assetType, local, temporary, data, create_time, access_time)
+                SELECT CONVERT(uniqueidentifier, id), name, description, assetType, local, temporary, data, create_time, access_time FROM dbo.assets WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE assets
+
+EXECUTE sp_rename N'Tmp_assets', N'assets', 'OBJECT' 
+
+ALTER TABLE dbo.assets ADD CONSTRAINT
+        PK__assets__id PRIMARY KEY CLUSTERED 
+        (
+        id
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 5
+
+DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621';
+
+
diff --git a/OpenSim/Data/MSSQL/Resources/001_AuthStore.sql b/OpenSim/Data/MSSQL/Resources/AuthStore.migrations
index c70a193..5b90ca3 100644
--- a/OpenSim/Data/MSSQL/Resources/001_AuthStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/AuthStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION
 
 CREATE TABLE [auth] (
@@ -14,4 +16,13 @@ CREATE TABLE [tokens] (
   [validity] [datetime] NOT NULL )
   ON [PRIMARY]
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users;
+
+
 COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_Avatar.sql b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
index 48f4c00..759e939 100644
--- a/OpenSim/Data/MSSQL/Resources/001_Avatar.sql
+++ b/OpenSim/Data/MSSQL/Resources/Avatar.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION
 
 CREATE TABLE [Avatars] (
diff --git a/OpenSim/Data/MSSQL/Resources/EstateStore.migrations b/OpenSim/Data/MSSQL/Resources/EstateStore.migrations
new file mode 100644
index 0000000..64b2d2b
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/EstateStore.migrations
@@ -0,0 +1,334 @@
+:VERSION 1
+
+BEGIN TRANSACTION
+
+CREATE TABLE [dbo].[estate_managers](
+        [EstateID] [int] NOT NULL,
+        [uuid] [varchar](36) NOT NULL,
+ CONSTRAINT [PK_estate_managers] PRIMARY KEY CLUSTERED 
+(
+        [EstateID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE TABLE [dbo].[estate_groups](
+        [EstateID] [int] NOT NULL,
+        [uuid] [varchar](36) NOT NULL,
+ CONSTRAINT [PK_estate_groups] PRIMARY KEY CLUSTERED 
+(
+        [EstateID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+
+CREATE TABLE [dbo].[estate_users](
+        [EstateID] [int] NOT NULL,
+        [uuid] [varchar](36) NOT NULL,
+ CONSTRAINT [PK_estate_users] PRIMARY KEY CLUSTERED 
+(
+        [EstateID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+
+CREATE TABLE [dbo].[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),
+ CONSTRAINT [PK_estateban] PRIMARY KEY CLUSTERED 
+(
+        [EstateID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE TABLE [dbo].[estate_settings](
+        [EstateID] [int] IDENTITY(1,100) NOT NULL,
+        [EstateName] [varchar](64) NULL DEFAULT (NULL),
+        [AbuseEmailToEstateOwner] [bit] NOT NULL,
+        [DenyAnonymous] [bit] NOT NULL,
+        [ResetHomeOnTeleport] [bit] NOT NULL,
+        [FixedSun] [bit] NOT NULL,
+        [DenyTransacted] [bit] NOT NULL,
+        [BlockDwell] [bit] NOT NULL,
+        [DenyIdentified] [bit] NOT NULL,
+        [AllowVoice] [bit] NOT NULL,
+        [UseGlobalTime] [bit] NOT NULL,
+        [PricePerMeter] [int] NOT NULL,
+        [TaxFree] [bit] NOT NULL,
+        [AllowDirectTeleport] [bit] NOT NULL,
+        [RedirectGridX] [int] NOT NULL,
+        [RedirectGridY] [int] NOT NULL,
+        [ParentEstateID] [int] NOT NULL,
+        [SunPosition] [float] NOT NULL,
+        [EstateSkipScripts] [bit] NOT NULL,
+        [BillableFactor] [float] NOT NULL,
+        [PublicAccess] [bit] NOT NULL,
+        [AbuseEmail] [varchar](255) NOT NULL,
+        [EstateOwner] [varchar](36) NOT NULL,
+        [DenyMinors] [bit] NOT NULL,
+ CONSTRAINT [PK_estate_settings] PRIMARY KEY CLUSTERED 
+(
+        [EstateID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+
+CREATE TABLE [dbo].[estate_map](
+        [RegionID] [varchar](36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        [EstateID] [int] NOT NULL,
+ CONSTRAINT [PK_estate_map] PRIMARY KEY CLUSTERED 
+(
+        [RegionID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY];
+
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE dbo.estate_managers DROP CONSTRAINT PK_estate_managers
+
+CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+ALTER TABLE dbo.estate_groups DROP CONSTRAINT PK_estate_groups
+
+CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+ALTER TABLE dbo.estate_users DROP CONSTRAINT PK_estate_users
+
+CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estateban
+        (
+        EstateID int NOT NULL,
+        bannedUUID varchar(36) NOT NULL,
+        bannedIp varchar(16) NULL,
+        bannedIpHostMask varchar(16) NULL,
+        bannedNameMask varchar(64) NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estateban)
+         EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
+                SELECT EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban')
+
+DROP TABLE dbo.estateban
+
+EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estate_managers
+        (
+        EstateID int NOT NULL,
+        uuid uniqueidentifier NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estate_managers)
+         EXEC('INSERT INTO dbo.Tmp_estate_managers (EstateID, uuid)
+                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_managers WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.estate_managers
+
+EXECUTE sp_rename N'dbo.Tmp_estate_managers', N'estate_managers', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_estate_managers ON dbo.estate_managers
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 5
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estate_groups
+        (
+        EstateID int NOT NULL,
+        uuid uniqueidentifier NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estate_groups)
+         EXEC('INSERT INTO dbo.Tmp_estate_groups (EstateID, uuid)
+                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_groups WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.estate_groups
+
+EXECUTE sp_rename N'dbo.Tmp_estate_groups', N'estate_groups', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_estate_groups ON dbo.estate_groups
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 6
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estate_users
+        (
+        EstateID int NOT NULL,
+        uuid uniqueidentifier NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estate_users)
+         EXEC('INSERT INTO dbo.Tmp_estate_users (EstateID, uuid)
+                SELECT EstateID, CONVERT(uniqueidentifier, uuid) FROM dbo.estate_users WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.estate_users
+
+EXECUTE sp_rename N'dbo.Tmp_estate_users', N'estate_users', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_estate_users ON dbo.estate_users
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 7
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estateban
+        (
+        EstateID int NOT NULL,
+        bannedUUID uniqueidentifier NOT NULL,
+        bannedIp varchar(16) NULL,
+        bannedIpHostMask varchar(16) NULL,
+        bannedNameMask varchar(64) NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estateban)
+         EXEC('INSERT INTO dbo.Tmp_estateban (EstateID, bannedUUID, bannedIp, bannedIpHostMask, bannedNameMask)
+                SELECT EstateID, CONVERT(uniqueidentifier, bannedUUID), bannedIp, bannedIpHostMask, bannedNameMask FROM dbo.estateban WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.estateban
+
+EXECUTE sp_rename N'dbo.Tmp_estateban', N'estateban', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_estateban ON dbo.estateban
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 8
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estate_settings
+        (
+        EstateID int NOT NULL IDENTITY (1, 100),
+        EstateName varchar(64) NULL DEFAULT (NULL),
+        AbuseEmailToEstateOwner bit NOT NULL,
+        DenyAnonymous bit NOT NULL,
+        ResetHomeOnTeleport bit NOT NULL,
+        FixedSun bit NOT NULL,
+        DenyTransacted bit NOT NULL,
+        BlockDwell bit NOT NULL,
+        DenyIdentified bit NOT NULL,
+        AllowVoice bit NOT NULL,
+        UseGlobalTime bit NOT NULL,
+        PricePerMeter int NOT NULL,
+        TaxFree bit NOT NULL,
+        AllowDirectTeleport bit NOT NULL,
+        RedirectGridX int NOT NULL,
+        RedirectGridY int NOT NULL,
+        ParentEstateID int NOT NULL,
+        SunPosition float(53) NOT NULL,
+        EstateSkipScripts bit NOT NULL,
+        BillableFactor float(53) NOT NULL,
+        PublicAccess bit NOT NULL,
+        AbuseEmail varchar(255) NOT NULL,
+        EstateOwner uniqueidentifier NOT NULL,
+        DenyMinors bit NOT NULL
+        )  ON [PRIMARY]
+
+SET IDENTITY_INSERT dbo.Tmp_estate_settings ON
+
+IF EXISTS(SELECT * FROM dbo.estate_settings)
+         EXEC('INSERT INTO dbo.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, CONVERT(uniqueidentifier, EstateOwner), DenyMinors FROM dbo.estate_settings WITH (HOLDLOCK TABLOCKX)')
+
+SET IDENTITY_INSERT dbo.Tmp_estate_settings OFF
+
+DROP TABLE dbo.estate_settings
+
+EXECUTE sp_rename N'dbo.Tmp_estate_settings', N'estate_settings', 'OBJECT' 
+
+ALTER TABLE dbo.estate_settings ADD CONSTRAINT
+        PK_estate_settings PRIMARY KEY CLUSTERED 
+        (
+        EstateID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 9
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_estate_map
+        (
+        RegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        EstateID int NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.estate_map)
+         EXEC('INSERT INTO dbo.Tmp_estate_map (RegionID, EstateID)
+                SELECT CONVERT(uniqueidentifier, RegionID), EstateID FROM dbo.estate_map WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.estate_map
+
+EXECUTE sp_rename N'dbo.Tmp_estate_map', N'estate_map', 'OBJECT' 
+
+ALTER TABLE dbo.estate_map ADD CONSTRAINT
+        PK_estate_map PRIMARY KEY CLUSTERED 
+        (
+        RegionID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+COMMIT
+
+
diff --git a/OpenSim/Data/MSSQL/Resources/001_FriendsStore.sql b/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations
index 94d240b..f981a91 100644
--- a/OpenSim/Data/MSSQL/Resources/001_FriendsStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION
 
 CREATE TABLE [Friends] (
@@ -7,5 +9,12 @@ CREATE TABLE [Friends] (
 [Offered] varchar(32) NOT NULL DEFAULT 0)
  ON [PRIMARY]
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends;
 
 COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/GridStore.migrations b/OpenSim/Data/MSSQL/Resources/GridStore.migrations
new file mode 100644
index 0000000..d2ca27a
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/GridStore.migrations
@@ -0,0 +1,225 @@
+:VERSION 1
+
+BEGIN TRANSACTION
+
+CREATE TABLE [dbo].[regions](
+ [regionHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionName] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [uuid] [varchar](255) COLLATE Latin1_General_CI_AS NOT NULL,
+ [regionRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionSecret] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionDataURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [serverIP] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [serverPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [serverURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [locX] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [locY] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [locZ] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [eastOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [westOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [southOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [northOverrideHandle] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionAssetURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionAssetRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionAssetSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionUserURI] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionUserRecvKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionUserSendKey] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [regionMapTexture] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [serverHttpPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [serverRemotingPort] [varchar](255) COLLATE Latin1_General_CI_AS NULL,
+ [owner_uuid] [varchar](36) COLLATE Latin1_General_CI_AS NULL,
+PRIMARY KEY CLUSTERED 
+(
+ [uuid] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_regions
+        (
+        uuid varchar(36) COLLATE Latin1_General_CI_AS NOT NULL,
+        regionHandle bigint NULL,
+        regionName varchar(20) NULL,
+        regionRecvKey varchar(128) NULL,
+        regionSendKey varchar(128) NULL,
+        regionSecret varchar(128) NULL,
+        regionDataURI varchar(128) NULL,
+        serverIP varchar(64) NULL,
+        serverPort int NULL,
+        serverURI varchar(255) NULL,
+        locX int NULL,
+        locY int NULL,
+        locZ int NULL,
+        eastOverrideHandle bigint NULL,
+        westOverrideHandle bigint NULL,
+        southOverrideHandle bigint NULL,
+        northOverrideHandle bigint NULL,
+        regionAssetURI varchar(255) NULL,
+        regionAssetRecvKey varchar(128) NULL,
+        regionAssetSendKey varchar(128) NULL,
+        regionUserURI varchar(255) NULL,
+        regionUserRecvKey varchar(128) NULL,
+        regionUserSendKey varchar(128) NULL,
+        regionMapTexture varchar(36) NULL,
+        serverHttpPort int NULL,
+        serverRemotingPort int NULL,
+        owner_uuid varchar(36) NULL,
+        originUUID varchar(36) NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM regions)
+         EXEC('INSERT INTO Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid)
+                SELECT CONVERT(varchar(36), uuid), CONVERT(bigint, regionHandle), CONVERT(varchar(20), regionName), CONVERT(varchar(128), regionRecvKey), CONVERT(varchar(128), regionSendKey), CONVERT(varchar(128), regionSecret), CONVERT(varchar(128), regionDataURI), CONVERT(varchar(64), serverIP), CONVERT(int, serverPort), serverURI, CONVERT(int, locX), CONVERT(int, locY), CONVERT(int, locZ), CONVERT(bigint, eastOverrideHandle), CONVERT(bigint, westOverrideHandle), CONVERT(bigint, southOverrideHandle), CONVERT(bigint, northOverrideHandle), regionAssetURI, CONVERT(varchar(128), regionAssetRecvKey), CONVERT(varchar(128), regionAssetSendKey), regionUserURI, CONVERT(varchar(128), regionUserRecvKey), CONVERT(varchar(128), regionUserSendKey), CONVERT(varchar(36), regionMapTexture), CONVERT(int, serverHttpPort), CONVERT(int, serverRemotingPort), owner_uuid FROM regions')
+
+DROP TABLE regions
+
+EXECUTE sp_rename N'Tmp_regions', N'regions', 'OBJECT' 
+
+ALTER TABLE regions ADD CONSTRAINT
+        PK__regions__uuid PRIMARY KEY CLUSTERED 
+        (
+        uuid
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
+        (
+        regionName
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
+        (
+        regionHandle
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
+        (
+        eastOverrideHandle,
+        westOverrideHandle,
+        southOverrideHandle,
+        northOverrideHandle
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 4
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_regions
+        (
+        uuid uniqueidentifier NOT NULL,
+        regionHandle bigint NULL,
+        regionName varchar(20) NULL,
+        regionRecvKey varchar(128) NULL,
+        regionSendKey varchar(128) NULL,
+        regionSecret varchar(128) NULL,
+        regionDataURI varchar(128) NULL,
+        serverIP varchar(64) NULL,
+        serverPort int NULL,
+        serverURI varchar(255) NULL,
+        locX int NULL,
+        locY int NULL,
+        locZ int NULL,
+        eastOverrideHandle bigint NULL,
+        westOverrideHandle bigint NULL,
+        southOverrideHandle bigint NULL,
+        northOverrideHandle bigint NULL,
+        regionAssetURI varchar(255) NULL,
+        regionAssetRecvKey varchar(128) NULL,
+        regionAssetSendKey varchar(128) NULL,
+        regionUserURI varchar(255) NULL,
+        regionUserRecvKey varchar(128) NULL,
+        regionUserSendKey varchar(128) NULL,
+        regionMapTexture uniqueidentifier NULL,
+        serverHttpPort int NULL,
+        serverRemotingPort int NULL,
+        owner_uuid uniqueidentifier NOT NULL,
+        originUUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000')
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.regions)
+         EXEC('INSERT INTO dbo.Tmp_regions (uuid, regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID)
+                SELECT CONVERT(uniqueidentifier, uuid), regionHandle, regionName, regionRecvKey, regionSendKey, regionSecret, regionDataURI, serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, CONVERT(uniqueidentifier, regionMapTexture), serverHttpPort, serverRemotingPort, CONVERT(uniqueidentifier, owner_uuid), CONVERT(uniqueidentifier, originUUID) FROM dbo.regions WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.regions
+
+EXECUTE sp_rename N'dbo.Tmp_regions', N'regions', 'OBJECT' 
+
+ALTER TABLE dbo.regions ADD CONSTRAINT
+        PK__regions__uuid PRIMARY KEY CLUSTERED 
+        (
+        uuid
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions
+        (
+        regionName
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_regions_handle ON dbo.regions
+        (
+        regionHandle
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_regions_override ON dbo.regions
+        (
+        eastOverrideHandle,
+        westOverrideHandle,
+        southOverrideHandle,
+        northOverrideHandle
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 5
+
+BEGIN TRANSACTION
+
+ALTER TABLE regions ADD access int default 0;
+
+COMMIT
+
+
+:VERSION 6
+
+BEGIN TRANSACTION
+
+ALTER TABLE regions ADD scopeid uniqueidentifier default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE regions ADD DEFAULT ('00000000-0000-0000-0000-000000000000') FOR [owner_uuid];
+ALTER TABLE regions ADD sizeX integer not null default 0;
+ALTER TABLE regions ADD sizeY integer not null default 0;
+
+COMMIT
+
+
+:VERSION 7
+
+BEGIN TRANSACTION
+
+ALTER TABLE regions ADD [flags] integer NOT NULL DEFAULT 0;
+CREATE INDEX [flags] ON regions(flags);
+ALTER TABLE [regions] ADD [last_seen] integer NOT NULL DEFAULT 0;
+ALTER TABLE [regions] ADD [PrincipalID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0;
+
+COMMIT
+
+
diff --git a/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations b/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations
new file mode 100644
index 0000000..cd5dfdc
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations
@@ -0,0 +1,174 @@
+:VERSION 1
+
+BEGIN TRANSACTION
+
+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 CLUSTERED
+(
+        [folderID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX [owner] ON [inventoryfolders]
+(
+        [agentID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX [parent] ON [inventoryfolders]
+(
+        [parentFolderID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+
+CREATE TABLE [inventoryitems] (
+  [inventoryID] [varchar](36) NOT NULL default '',
+  [assetID] [varchar](36) default NULL,
+  [assetType] [int] default NULL,
+  [parentFolderID] [varchar](36) default NULL,
+  [avatarID] [varchar](36) default NULL,
+  [inventoryName] [varchar](64) default NULL,
+  [inventoryDescription] [varchar](128) default NULL,
+  [inventoryNextPermissions] [int] default NULL,
+  [inventoryCurrentPermissions] [int] default NULL,
+  [invType] [int] default NULL,
+  [creatorID] [varchar](36) default NULL,
+  [inventoryBasePermissions] [int] NOT NULL default 0,
+  [inventoryEveryOnePermissions] [int] NOT NULL default 0,
+  [salePrice] [int] default NULL,
+  [saleType] [tinyint] default NULL,
+  [creationDate] [int] default NULL,
+  [groupID] [varchar](36) default NULL,
+  [groupOwned] [bit] default NULL,
+  [flags] [int] default NULL,
+  PRIMARY KEY CLUSTERED
+(
+        [inventoryID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX [owner] ON [inventoryitems]
+(
+        [avatarID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX [folder] ON [inventoryitems]
+(
+        [parentFolderID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE inventoryitems ADD inventoryGroupPermissions INTEGER NOT NULL default 0
+
+COMMIT
+
+:VERSION 3
+
+/* To prevent any potential data loss issues, you should review this script in detail before running it outside the context of the database designer.*/
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_inventoryfolders
+        (
+        folderID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        agentID uniqueidentifier NULL DEFAULT (NULL),
+        parentFolderID uniqueidentifier NULL DEFAULT (NULL),
+        folderName varchar(64) NULL DEFAULT (NULL),
+        type smallint NOT NULL DEFAULT ((0)),
+        version int NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.inventoryfolders)
+         EXEC('INSERT INTO dbo.Tmp_inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version)
+                SELECT CONVERT(uniqueidentifier, folderID), CONVERT(uniqueidentifier, agentID), CONVERT(uniqueidentifier, parentFolderID), folderName, type, version FROM dbo.inventoryfolders WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.inventoryfolders
+
+EXECUTE sp_rename N'dbo.Tmp_inventoryfolders', N'inventoryfolders', 'OBJECT' 
+
+ALTER TABLE dbo.inventoryfolders ADD CONSTRAINT
+        PK__inventor__C2FABFB3173876EA PRIMARY KEY CLUSTERED 
+        (
+        folderID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX owner ON dbo.inventoryfolders
+        (
+        agentID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX parent ON dbo.inventoryfolders
+        (
+        parentFolderID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_inventoryitems
+        (
+        inventoryID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        assetID uniqueidentifier NULL DEFAULT (NULL),
+        assetType int NULL DEFAULT (NULL),
+        parentFolderID uniqueidentifier NULL DEFAULT (NULL),
+        avatarID uniqueidentifier NULL DEFAULT (NULL),
+        inventoryName varchar(64) NULL DEFAULT (NULL),
+        inventoryDescription varchar(128) NULL DEFAULT (NULL),
+        inventoryNextPermissions int NULL DEFAULT (NULL),
+        inventoryCurrentPermissions int NULL DEFAULT (NULL),
+        invType int NULL DEFAULT (NULL),
+        creatorID uniqueidentifier NULL DEFAULT (NULL),
+        inventoryBasePermissions int NOT NULL DEFAULT ((0)),
+        inventoryEveryOnePermissions int NOT NULL DEFAULT ((0)),
+        salePrice int NULL DEFAULT (NULL),
+        saleType tinyint NULL DEFAULT (NULL),
+        creationDate int NULL DEFAULT (NULL),
+        groupID uniqueidentifier NULL DEFAULT (NULL),
+        groupOwned bit NULL DEFAULT (NULL),
+        flags int NULL DEFAULT (NULL),
+        inventoryGroupPermissions int NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.inventoryitems)
+         EXEC('INSERT INTO dbo.Tmp_inventoryitems (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryGroupPermissions)
+                SELECT CONVERT(uniqueidentifier, inventoryID), CONVERT(uniqueidentifier, assetID), assetType, CONVERT(uniqueidentifier, parentFolderID), CONVERT(uniqueidentifier, avatarID), inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, CONVERT(uniqueidentifier, creatorID), inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, CONVERT(uniqueidentifier, groupID), groupOwned, flags, inventoryGroupPermissions FROM dbo.inventoryitems WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.inventoryitems
+
+EXECUTE sp_rename N'dbo.Tmp_inventoryitems', N'inventoryitems', 'OBJECT' 
+
+ALTER TABLE dbo.inventoryitems ADD CONSTRAINT
+        PK__inventor__C4B7BC2220C1E124 PRIMARY KEY CLUSTERED 
+        (
+        inventoryID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX owner ON dbo.inventoryitems
+        (
+        avatarID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX folder ON dbo.inventoryitems
+        (
+        parentFolderID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
diff --git a/OpenSim/Data/MSSQL/Resources/001_LogStore.sql b/OpenSim/Data/MSSQL/Resources/LogStore.migrations
index 9ece627..1430d8d 100644
--- a/OpenSim/Data/MSSQL/Resources/001_LogStore.sql
+++ b/OpenSim/Data/MSSQL/Resources/LogStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION
 
 CREATE TABLE [logs] (
diff --git a/OpenSim/Data/MSSQL/Resources/001_Presence.sql b/OpenSim/Data/MSSQL/Resources/Presence.migrations
index 877881c..35f78e1 100644
--- a/OpenSim/Data/MSSQL/Resources/001_Presence.sql
+++ b/OpenSim/Data/MSSQL/Resources/Presence.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION
 
 CREATE TABLE [Presence] (
@@ -16,4 +18,13 @@ CREATE TABLE [Presence] (
 )
  ON [PRIMARY]
 
+COMMIT
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
 COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
new file mode 100644
index 0000000..e912d64
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -0,0 +1,929 @@
+
+:VERSION 1
+
+CREATE TABLE [dbo].[prims](
+        [UUID] [varchar](255) NOT NULL,
+        [RegionUUID] [varchar](255) NULL,
+        [ParentID] [int] NULL,
+        [CreationDate] [int] NULL,
+        [Name] [varchar](255) NULL,
+        [SceneGroupID] [varchar](255) NULL,
+        [Text] [varchar](255) NULL,
+        [Description] [varchar](255) NULL,
+        [SitName] [varchar](255) NULL,
+        [TouchName] [varchar](255) NULL,
+        [ObjectFlags] [int] NULL,
+        [CreatorID] [varchar](255) NULL,
+        [OwnerID] [varchar](255) NULL,
+        [GroupID] [varchar](255) NULL,
+        [LastOwnerID] [varchar](255) NULL,
+        [OwnerMask] [int] NULL,
+        [NextOwnerMask] [int] NULL,
+        [GroupMask] [int] NULL,
+        [EveryoneMask] [int] NULL,
+        [BaseMask] [int] NULL,
+        [PositionX] [float] NULL,
+        [PositionY] [float] NULL,
+        [PositionZ] [float] NULL,
+        [GroupPositionX] [float] NULL,
+        [GroupPositionY] [float] NULL,
+        [GroupPositionZ] [float] NULL,
+        [VelocityX] [float] NULL,
+        [VelocityY] [float] NULL,
+        [VelocityZ] [float] NULL,
+        [AngularVelocityX] [float] NULL,
+        [AngularVelocityY] [float] NULL,
+        [AngularVelocityZ] [float] NULL,
+        [AccelerationX] [float] NULL,
+        [AccelerationY] [float] NULL,
+        [AccelerationZ] [float] NULL,
+        [RotationX] [float] NULL,
+        [RotationY] [float] NULL,
+        [RotationZ] [float] NULL,
+        [RotationW] [float] NULL,
+        [SitTargetOffsetX] [float] NULL,
+        [SitTargetOffsetY] [float] NULL,
+        [SitTargetOffsetZ] [float] NULL,
+        [SitTargetOrientW] [float] NULL,
+        [SitTargetOrientX] [float] NULL,
+        [SitTargetOrientY] [float] NULL,
+        [SitTargetOrientZ] [float] NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [UUID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+
+CREATE TABLE [dbo].[primshapes](
+        [UUID] [varchar](255) NOT NULL,
+        [Shape] [int] NULL,
+        [ScaleX] [float] NULL,
+        [ScaleY] [float] NULL,
+        [ScaleZ] [float] NULL,
+        [PCode] [int] NULL,
+        [PathBegin] [int] NULL,
+        [PathEnd] [int] NULL,
+        [PathScaleX] [int] NULL,
+        [PathScaleY] [int] NULL,
+        [PathShearX] [int] NULL,
+        [PathShearY] [int] NULL,
+        [PathSkew] [int] NULL,
+        [PathCurve] [int] NULL,
+        [PathRadiusOffset] [int] NULL,
+        [PathRevolutions] [int] NULL,
+        [PathTaperX] [int] NULL,
+        [PathTaperY] [int] NULL,
+        [PathTwist] [int] NULL,
+        [PathTwistBegin] [int] NULL,
+        [ProfileBegin] [int] NULL,
+        [ProfileEnd] [int] NULL,
+        [ProfileCurve] [int] NULL,
+        [ProfileHollow] [int] NULL,
+        [State] [int] NULL,
+        [Texture] [image] NULL,
+        [ExtraParams] [image] NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [UUID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+CREATE TABLE [dbo].[primitems](
+        [itemID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+        [primID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [assetID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [parentFolderID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [invType] [int] NULL,
+        [assetType] [int] NULL,
+        [name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [description] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [creationDate] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [creatorID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [ownerID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [lastOwnerID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [groupID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [nextPermissions] [int] NULL,
+        [currentPermissions] [int] NULL,
+        [basePermissions] [int] NULL,
+        [everyonePermissions] [int] NULL,
+        [groupPermissions] [int] NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [itemID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+
+CREATE TABLE [dbo].[terrain](
+        [RegionUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [Revision] [int] NULL,
+        [Heightfield] [image] NULL
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+CREATE TABLE [dbo].[land](
+        [UUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+        [RegionUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [LocalLandID] [int] NULL,
+        [Bitmap] [image] NULL,
+        [Name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [Description] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [OwnerUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [IsGroupOwned] [int] NULL,
+        [Area] [int] NULL,
+        [AuctionID] [int] NULL,
+        [Category] [int] NULL,
+        [ClaimDate] [int] NULL,
+        [ClaimPrice] [int] NULL,
+        [GroupUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [SalePrice] [int] NULL,
+        [LandStatus] [int] NULL,
+        [LandFlags] [int] NULL,
+        [LandingType] [int] NULL,
+        [MediaAutoScale] [int] NULL,
+        [MediaTextureUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [MediaURL] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [MusicURL] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [PassHours] [float] NULL,
+        [PassPrice] [int] NULL,
+        [SnapshotUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [UserLocationX] [float] NULL,
+        [UserLocationY] [float] NULL,
+        [UserLocationZ] [float] NULL,
+        [UserLookAtX] [float] NULL,
+        [UserLookAtY] [float] NULL,
+        [UserLookAtZ] [float] NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [UUID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+CREATE TABLE [dbo].[landaccesslist](
+        [LandUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [AccessUUID] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+        [Flags] [int] NULL
+) ON [PRIMARY]
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+CREATE TABLE regionban (
+        [regionUUID] VARCHAR(36) NOT NULL, 
+        [bannedUUID] VARCHAR(36) NOT NULL, 
+        [bannedIp] VARCHAR(16) NOT NULL, 
+        [bannedIpHostMask] VARCHAR(16) NOT NULL)
+
+create table [dbo].[regionsettings] (
+        [regionUUID] [varchar](36) not null,
+        [block_terraform] [bit] not null,
+        [block_fly] [bit] not null,
+        [allow_damage] [bit] not null,
+        [restrict_pushing] [bit] not null,
+        [allow_land_resell] [bit] not null,
+        [allow_land_join_divide] [bit] not null,
+        [block_show_in_search] [bit] not null,
+        [agent_limit] [int] not null,
+        [object_bonus] [float] not null,
+        [maturity] [int] not null,
+        [disable_scripts] [bit] not null,
+        [disable_collisions] [bit] not null,
+        [disable_physics] [bit] not null,
+        [terrain_texture_1] [varchar](36) not null,
+        [terrain_texture_2] [varchar](36) not null,
+        [terrain_texture_3] [varchar](36) not null,
+        [terrain_texture_4] [varchar](36) not null,
+        [elevation_1_nw] [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] [bit] not null,
+        [fixed_sun] [bit] not null,
+        [sun_position] [float] not null,
+        [covenant] [varchar](36) default NULL,
+        [Sandbox] [bit] NOT NULL,
+PRIMARY KEY CLUSTERED 
+(
+        [regionUUID] ASC
+)WITH (PAD_INDEX  = OFF, IGNORE_DUP_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+
+COMMIT
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_prims
+        (
+        UUID varchar(36) NOT NULL,
+        RegionUUID varchar(36) NULL,
+        ParentID int NULL,
+        CreationDate int NULL,
+        Name varchar(255) NULL,
+        SceneGroupID varchar(36) NULL,
+        Text varchar(255) NULL,
+        Description varchar(255) NULL,
+        SitName varchar(255) NULL,
+        TouchName varchar(255) NULL,
+        ObjectFlags int NULL,
+        CreatorID varchar(36) NULL,
+        OwnerID varchar(36) NULL,
+        GroupID varchar(36) NULL,
+        LastOwnerID varchar(36) NULL,
+        OwnerMask int NULL,
+        NextOwnerMask int NULL,
+        GroupMask int NULL,
+        EveryoneMask int NULL,
+        BaseMask int NULL,
+        PositionX float(53) NULL,
+        PositionY float(53) NULL,
+        PositionZ float(53) NULL,
+        GroupPositionX float(53) NULL,
+        GroupPositionY float(53) NULL,
+        GroupPositionZ float(53) NULL,
+        VelocityX float(53) NULL,
+        VelocityY float(53) NULL,
+        VelocityZ float(53) NULL,
+        AngularVelocityX float(53) NULL,
+        AngularVelocityY float(53) NULL,
+        AngularVelocityZ float(53) NULL,
+        AccelerationX float(53) NULL,
+        AccelerationY float(53) NULL,
+        AccelerationZ float(53) NULL,
+        RotationX float(53) NULL,
+        RotationY float(53) NULL,
+        RotationZ float(53) NULL,
+        RotationW float(53) NULL,
+        SitTargetOffsetX float(53) NULL,
+        SitTargetOffsetY float(53) NULL,
+        SitTargetOffsetZ float(53) NULL,
+        SitTargetOrientW float(53) NULL,
+        SitTargetOrientX float(53) NULL,
+        SitTargetOrientY float(53) NULL,
+        SitTargetOrientZ float(53) NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.prims)
+         EXEC('INSERT INTO dbo.Tmp_prims (UUID, RegionUUID, ParentID, CreationDate, Name, SceneGroupID, Text, Description, SitName, TouchName, ObjectFlags, CreatorID, OwnerID, GroupID, LastOwnerID, OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ)
+                SELECT CONVERT(varchar(36), UUID), CONVERT(varchar(36), RegionUUID), ParentID, CreationDate, Name, CONVERT(varchar(36), SceneGroupID), Text, Description, SitName, TouchName, ObjectFlags, CONVERT(varchar(36), CreatorID), CONVERT(varchar(36), OwnerID), CONVERT(varchar(36), GroupID), CONVERT(varchar(36), LastOwnerID), OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ FROM dbo.prims WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.prims
+
+EXECUTE sp_rename N'dbo.Tmp_prims', N'prims', 'OBJECT' 
+
+ALTER TABLE dbo.prims ADD CONSTRAINT
+        PK__prims__10566F31 PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_primitems
+        (
+        itemID varchar(36) NOT NULL,
+        primID varchar(36) NULL,
+        assetID varchar(36) NULL,
+        parentFolderID varchar(36) NULL,
+        invType int NULL,
+        assetType int NULL,
+        name varchar(255) NULL,
+        description varchar(255) NULL,
+        creationDate varchar(255) NULL,
+        creatorID varchar(36) NULL,
+        ownerID varchar(36) NULL,
+        lastOwnerID varchar(36) NULL,
+        groupID varchar(36) NULL,
+        nextPermissions int NULL,
+        currentPermissions int NULL,
+        basePermissions int NULL,
+        everyonePermissions int NULL,
+        groupPermissions int NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM primitems)
+         EXEC('INSERT INTO Tmp_primitems (itemID, primID, assetID, parentFolderID, invType, assetType, name, description, creationDate, creatorID, ownerID, lastOwnerID, groupID, nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions)
+                SELECT CONVERT(varchar(36), itemID), CONVERT(varchar(36), primID), CONVERT(varchar(36), assetID), CONVERT(varchar(36), parentFolderID), invType, assetType, name, description, creationDate, CONVERT(varchar(36), creatorID), CONVERT(varchar(36), ownerID), CONVERT(varchar(36), lastOwnerID), CONVERT(varchar(36), groupID), nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions')
+
+DROP TABLE primitems
+
+EXECUTE sp_rename N'Tmp_primitems', N'primitems', 'OBJECT' 
+
+ALTER TABLE primitems ADD CONSTRAINT
+        PK__primitems__0A688BB1 PRIMARY KEY CLUSTERED 
+        (
+        itemID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+COMMIT
+
+
+:VERSION 5
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_primshapes
+        (
+        UUID varchar(36) NOT NULL,
+        Shape int NULL,
+        ScaleX float(53) NULL,
+        ScaleY float(53) NULL,
+        ScaleZ float(53) NULL,
+        PCode int NULL,
+        PathBegin int NULL,
+        PathEnd int NULL,
+        PathScaleX int NULL,
+        PathScaleY int NULL,
+        PathShearX int NULL,
+        PathShearY int NULL,
+        PathSkew int NULL,
+        PathCurve int NULL,
+        PathRadiusOffset int NULL,
+        PathRevolutions int NULL,
+        PathTaperX int NULL,
+        PathTaperY int NULL,
+        PathTwist int NULL,
+        PathTwistBegin int NULL,
+        ProfileBegin int NULL,
+        ProfileEnd int NULL,
+        ProfileCurve int NULL,
+        ProfileHollow int NULL,
+        State int NULL,
+        Texture image NULL,
+        ExtraParams image NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM primshapes)
+         EXEC('INSERT INTO Tmp_primshapes (UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams)
+                SELECT CONVERT(varchar(36), UUID), Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams FROM primshapes WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE primshapes
+
+EXECUTE sp_rename N'Tmp_primshapes', N'primshapes', 'OBJECT' 
+
+ALTER TABLE primshapes ADD CONSTRAINT
+        PK__primshapes__0880433F PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 6
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD PayPrice int not null default 0
+ALTER TABLE prims ADD PayButton1 int not null default 0
+ALTER TABLE prims ADD PayButton2 int not null default 0
+ALTER TABLE prims ADD PayButton3 int not null default 0
+ALTER TABLE prims ADD PayButton4 int not null default 0
+ALTER TABLE prims ADD LoopedSound varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE prims ADD LoopedSoundGain float not null default 0.0;
+ALTER TABLE prims ADD TextureAnimation image
+ALTER TABLE prims ADD OmegaX float not null default 0.0
+ALTER TABLE prims ADD OmegaY float not null default 0.0
+ALTER TABLE prims ADD OmegaZ float not null default 0.0
+ALTER TABLE prims ADD CameraEyeOffsetX float not null default 0.0
+ALTER TABLE prims ADD CameraEyeOffsetY float not null default 0.0
+ALTER TABLE prims ADD CameraEyeOffsetZ float not null default 0.0
+ALTER TABLE prims ADD CameraAtOffsetX float not null default 0.0
+ALTER TABLE prims ADD CameraAtOffsetY float not null default 0.0
+ALTER TABLE prims ADD CameraAtOffsetZ float not null default 0.0
+ALTER TABLE prims ADD ForceMouselook tinyint not null default 0
+ALTER TABLE prims ADD ScriptAccessPin int not null default 0
+ALTER TABLE prims ADD AllowedDrop tinyint not null default 0
+ALTER TABLE prims ADD DieAtEdge tinyint not null default 0
+ALTER TABLE prims ADD SalePrice int not null default 10
+ALTER TABLE prims ADD SaleType tinyint not null default 0
+
+ALTER TABLE primitems add flags integer not null default 0
+
+ALTER TABLE land ADD AuthbuyerID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000'
+
+CREATE index prims_regionuuid on prims(RegionUUID)
+CREATE index prims_parentid on prims(ParentID)
+
+CREATE index primitems_primid on primitems(primID)
+
+COMMIT
+
+
+:VERSION 7
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD ColorR int not null default 0;
+ALTER TABLE prims ADD ColorG int not null default 0;
+ALTER TABLE prims ADD ColorB int not null default 0;
+ALTER TABLE prims ADD ColorA int not null default 0;
+ALTER TABLE prims ADD ParticleSystem IMAGE;
+ALTER TABLE prims ADD ClickAction tinyint NOT NULL default 0;
+
+COMMIT
+
+
+:VERSION 8
+
+BEGIN TRANSACTION
+
+ALTER TABLE land ADD OtherCleanTime integer NOT NULL default 0;
+ALTER TABLE land ADD Dwell integer NOT NULL default 0;
+
+COMMIT
+
+:VERSION 9
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD Material tinyint NOT NULL default 3
+
+COMMIT
+
+
+:VERSION 10
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD sunvectorx float NOT NULL default 0;
+ALTER TABLE regionsettings ADD sunvectory float NOT NULL default 0;
+ALTER TABLE regionsettings ADD sunvectorz float NOT NULL default 0;
+
+COMMIT
+
+
+:VERSION 11
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD CollisionSound char(36) not null default '00000000-0000-0000-0000-000000000000'
+ALTER TABLE prims ADD CollisionSoundVolume float not null default 0.0
+
+COMMIT
+
+
+:VERSION 12
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD LinkNumber integer not null default 0
+
+COMMIT
+
+
+:VERSION 13
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_prims
+        (
+        UUID uniqueidentifier NOT NULL,
+        RegionUUID uniqueidentifier NULL,
+        ParentID int NULL,
+        CreationDate int NULL,
+        Name varchar(255) NULL,
+        SceneGroupID uniqueidentifier NULL,
+        Text varchar(255) NULL,
+        Description varchar(255) NULL,
+        SitName varchar(255) NULL,
+        TouchName varchar(255) NULL,
+        ObjectFlags int NULL,
+        CreatorID uniqueidentifier NULL,
+        OwnerID uniqueidentifier NULL,
+        GroupID uniqueidentifier NULL,
+        LastOwnerID uniqueidentifier NULL,
+        OwnerMask int NULL,
+        NextOwnerMask int NULL,
+        GroupMask int NULL,
+        EveryoneMask int NULL,
+        BaseMask int NULL,
+        PositionX float(53) NULL,
+        PositionY float(53) NULL,
+        PositionZ float(53) NULL,
+        GroupPositionX float(53) NULL,
+        GroupPositionY float(53) NULL,
+        GroupPositionZ float(53) NULL,
+        VelocityX float(53) NULL,
+        VelocityY float(53) NULL,
+        VelocityZ float(53) NULL,
+        AngularVelocityX float(53) NULL,
+        AngularVelocityY float(53) NULL,
+        AngularVelocityZ float(53) NULL,
+        AccelerationX float(53) NULL,
+        AccelerationY float(53) NULL,
+        AccelerationZ float(53) NULL,
+        RotationX float(53) NULL,
+        RotationY float(53) NULL,
+        RotationZ float(53) NULL,
+        RotationW float(53) NULL,
+        SitTargetOffsetX float(53) NULL,
+        SitTargetOffsetY float(53) NULL,
+        SitTargetOffsetZ float(53) NULL,
+        SitTargetOrientW float(53) NULL,
+        SitTargetOrientX float(53) NULL,
+        SitTargetOrientY float(53) NULL,
+        SitTargetOrientZ float(53) NULL,
+        PayPrice int NOT NULL DEFAULT ((0)),
+        PayButton1 int NOT NULL DEFAULT ((0)),
+        PayButton2 int NOT NULL DEFAULT ((0)),
+        PayButton3 int NOT NULL DEFAULT ((0)),
+        PayButton4 int NOT NULL DEFAULT ((0)),
+        LoopedSound uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        LoopedSoundGain float(53) NOT NULL DEFAULT ((0.0)),
+        TextureAnimation image NULL,
+        OmegaX float(53) NOT NULL DEFAULT ((0.0)),
+        OmegaY float(53) NOT NULL DEFAULT ((0.0)),
+        OmegaZ float(53) NOT NULL DEFAULT ((0.0)),
+        CameraEyeOffsetX float(53) NOT NULL DEFAULT ((0.0)),
+        CameraEyeOffsetY float(53) NOT NULL DEFAULT ((0.0)),
+        CameraEyeOffsetZ float(53) NOT NULL DEFAULT ((0.0)),
+        CameraAtOffsetX float(53) NOT NULL DEFAULT ((0.0)),
+        CameraAtOffsetY float(53) NOT NULL DEFAULT ((0.0)),
+        CameraAtOffsetZ float(53) NOT NULL DEFAULT ((0.0)),
+        ForceMouselook tinyint NOT NULL DEFAULT ((0)),
+        ScriptAccessPin int NOT NULL DEFAULT ((0)),
+        AllowedDrop tinyint NOT NULL DEFAULT ((0)),
+        DieAtEdge tinyint NOT NULL DEFAULT ((0)),
+        SalePrice int NOT NULL DEFAULT ((10)),
+        SaleType tinyint NOT NULL DEFAULT ((0)),
+        ColorR int NOT NULL DEFAULT ((0)),
+        ColorG int NOT NULL DEFAULT ((0)),
+        ColorB int NOT NULL DEFAULT ((0)),
+        ColorA int NOT NULL DEFAULT ((0)),
+        ParticleSystem image NULL,
+        ClickAction tinyint NOT NULL DEFAULT ((0)),
+        Material tinyint NOT NULL DEFAULT ((3)),
+        CollisionSound uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        CollisionSoundVolume float(53) NOT NULL DEFAULT ((0.0)),
+        LinkNumber int NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.prims)
+         EXEC('INSERT INTO dbo.Tmp_prims (UUID, RegionUUID, ParentID, CreationDate, Name, SceneGroupID, Text, Description, SitName, TouchName, ObjectFlags, CreatorID, OwnerID, GroupID, LastOwnerID, OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ, PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, LoopedSound, LoopedSoundGain, TextureAnimation, OmegaX, OmegaY, OmegaZ, CameraEyeOffsetX, CameraEyeOffsetY, CameraEyeOffsetZ, CameraAtOffsetX, CameraAtOffsetY, CameraAtOffsetZ, ForceMouselook, ScriptAccessPin, AllowedDrop, DieAtEdge, SalePrice, SaleType, ColorR, ColorG, ColorB, ColorA, ParticleSystem, ClickAction, Material, CollisionSound, CollisionSoundVolume, LinkNumber)
+                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, RegionUUID), ParentID, CreationDate, Name, CONVERT(uniqueidentifier, SceneGroupID), Text, Description, SitName, TouchName, ObjectFlags, CONVERT(uniqueidentifier, CreatorID), CONVERT(uniqueidentifier, OwnerID), CONVERT(uniqueidentifier, GroupID), CONVERT(uniqueidentifier, LastOwnerID), OwnerMask, NextOwnerMask, GroupMask, EveryoneMask, BaseMask, PositionX, PositionY, PositionZ, GroupPositionX, GroupPositionY, GroupPositionZ, VelocityX, VelocityY, VelocityZ, AngularVelocityX, AngularVelocityY, AngularVelocityZ, AccelerationX, AccelerationY, AccelerationZ, RotationX, RotationY, RotationZ, RotationW, SitTargetOffsetX, SitTargetOffsetY, SitTargetOffsetZ, SitTargetOrientW, SitTargetOrientX, SitTargetOrientY, SitTargetOrientZ, PayPrice, PayButton1, PayButton2, PayButton3, PayButton4, CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, CollisionSound), CollisionSoundVolume, LinkNumber FROM dbo.prims WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.prims
+
+EXECUTE sp_rename N'dbo.Tmp_prims', N'prims', 'OBJECT' 
+
+ALTER TABLE dbo.prims ADD CONSTRAINT
+        PK__prims__10566F31 PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX prims_regionuuid ON dbo.prims
+        (
+        RegionUUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX prims_parentid ON dbo.prims
+        (
+        ParentID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 14
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_primshapes
+        (
+        UUID uniqueidentifier NOT NULL,
+        Shape int NULL,
+        ScaleX float(53) NULL,
+        ScaleY float(53) NULL,
+        ScaleZ float(53) NULL,
+        PCode int NULL,
+        PathBegin int NULL,
+        PathEnd int NULL,
+        PathScaleX int NULL,
+        PathScaleY int NULL,
+        PathShearX int NULL,
+        PathShearY int NULL,
+        PathSkew int NULL,
+        PathCurve int NULL,
+        PathRadiusOffset int NULL,
+        PathRevolutions int NULL,
+        PathTaperX int NULL,
+        PathTaperY int NULL,
+        PathTwist int NULL,
+        PathTwistBegin int NULL,
+        ProfileBegin int NULL,
+        ProfileEnd int NULL,
+        ProfileCurve int NULL,
+        ProfileHollow int NULL,
+        State int NULL,
+        Texture image NULL,
+        ExtraParams image NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.primshapes)
+         EXEC('INSERT INTO dbo.Tmp_primshapes (UUID, Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams)
+                SELECT CONVERT(uniqueidentifier, UUID), Shape, ScaleX, ScaleY, ScaleZ, PCode, PathBegin, PathEnd, PathScaleX, PathScaleY, PathShearX, PathShearY, PathSkew, PathCurve, PathRadiusOffset, PathRevolutions, PathTaperX, PathTaperY, PathTwist, PathTwistBegin, ProfileBegin, ProfileEnd, ProfileCurve, ProfileHollow, State, Texture, ExtraParams FROM dbo.primshapes WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.primshapes
+
+EXECUTE sp_rename N'dbo.Tmp_primshapes', N'primshapes', 'OBJECT' 
+
+ALTER TABLE dbo.primshapes ADD CONSTRAINT
+        PK__primshapes__0880433F PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 15
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_primitems
+        (
+        itemID uniqueidentifier NOT NULL,
+        primID uniqueidentifier NULL,
+        assetID uniqueidentifier NULL,
+        parentFolderID uniqueidentifier NULL,
+        invType int NULL,
+        assetType int NULL,
+        name varchar(255) NULL,
+        description varchar(255) NULL,
+        creationDate varchar(255) NULL,
+        creatorID uniqueidentifier NULL,
+        ownerID uniqueidentifier NULL,
+        lastOwnerID uniqueidentifier NULL,
+        groupID uniqueidentifier NULL,
+        nextPermissions int NULL,
+        currentPermissions int NULL,
+        basePermissions int NULL,
+        everyonePermissions int NULL,
+        groupPermissions int NULL,
+        flags int NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.primitems)
+         EXEC('INSERT INTO dbo.Tmp_primitems (itemID, primID, assetID, parentFolderID, invType, assetType, name, description, creationDate, creatorID, ownerID, lastOwnerID, groupID, nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions, flags)
+                SELECT CONVERT(uniqueidentifier, itemID), CONVERT(uniqueidentifier, primID), CONVERT(uniqueidentifier, assetID), CONVERT(uniqueidentifier, parentFolderID), invType, assetType, name, description, creationDate, CONVERT(uniqueidentifier, creatorID), CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, lastOwnerID), CONVERT(uniqueidentifier, groupID), nextPermissions, currentPermissions, basePermissions, everyonePermissions, groupPermissions, flags FROM dbo.primitems WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.primitems
+
+EXECUTE sp_rename N'dbo.Tmp_primitems', N'primitems', 'OBJECT' 
+
+ALTER TABLE dbo.primitems ADD CONSTRAINT
+        PK__primitems__0A688BB1 PRIMARY KEY CLUSTERED 
+        (
+        itemID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX primitems_primid ON dbo.primitems
+        (
+        primID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 16
+
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_terrain
+        (
+        RegionUUID uniqueidentifier NULL,
+        Revision int NULL,
+        Heightfield image NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.terrain)
+         EXEC('INSERT INTO dbo.Tmp_terrain (RegionUUID, Revision, Heightfield)
+                SELECT CONVERT(uniqueidentifier, RegionUUID), Revision, Heightfield FROM dbo.terrain WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.terrain
+
+EXECUTE sp_rename N'dbo.Tmp_terrain', N'terrain', 'OBJECT' 
+
+COMMIT
+
+
+:VERSION 17
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_land
+        (
+        UUID uniqueidentifier NOT NULL,
+        RegionUUID uniqueidentifier NULL,
+        LocalLandID int NULL,
+        Bitmap image NULL,
+        Name varchar(255) NULL,
+        Description varchar(255) NULL,
+        OwnerUUID uniqueidentifier NULL,
+        IsGroupOwned int NULL,
+        Area int NULL,
+        AuctionID int NULL,
+        Category int NULL,
+        ClaimDate int NULL,
+        ClaimPrice int NULL,
+        GroupUUID uniqueidentifier NULL,
+        SalePrice int NULL,
+        LandStatus int NULL,
+        LandFlags int NULL,
+        LandingType int NULL,
+        MediaAutoScale int NULL,
+        MediaTextureUUID uniqueidentifier NULL,
+        MediaURL varchar(255) NULL,
+        MusicURL varchar(255) NULL,
+        PassHours float(53) NULL,
+        PassPrice int NULL,
+        SnapshotUUID uniqueidentifier NULL,
+        UserLocationX float(53) NULL,
+        UserLocationY float(53) NULL,
+        UserLocationZ float(53) NULL,
+        UserLookAtX float(53) NULL,
+        UserLookAtY float(53) NULL,
+        UserLookAtZ float(53) NULL,
+        AuthbuyerID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        OtherCleanTime int NOT NULL DEFAULT ((0)),
+        Dwell int NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.land)
+         EXEC('INSERT INTO dbo.Tmp_land (UUID, RegionUUID, LocalLandID, Bitmap, Name, Description, OwnerUUID, IsGroupOwned, Area, AuctionID, Category, ClaimDate, ClaimPrice, GroupUUID, SalePrice, LandStatus, LandFlags, LandingType, MediaAutoScale, MediaTextureUUID, MediaURL, MusicURL, PassHours, PassPrice, SnapshotUUID, UserLocationX, UserLocationY, UserLocationZ, UserLookAtX, UserLookAtY, UserLookAtZ, AuthbuyerID, OtherCleanTime, Dwell)
+                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, RegionUUID), LocalLandID, Bitmap, Name, Description, CONVERT(uniqueidentifier, OwnerUUID), IsGroupOwned, Area, AuctionID, Category, ClaimDate, ClaimPrice, CONVERT(uniqueidentifier, GroupUUID), SalePrice, LandStatus, LandFlags, LandingType, MediaAutoScale, CONVERT(uniqueidentifier, MediaTextureUUID), MediaURL, MusicURL, PassHours, PassPrice, CONVERT(uniqueidentifier, SnapshotUUID), UserLocationX, UserLocationY, UserLocationZ, UserLookAtX, UserLookAtY, UserLookAtZ, CONVERT(uniqueidentifier, AuthbuyerID), OtherCleanTime, Dwell FROM dbo.land WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.land
+
+EXECUTE sp_rename N'dbo.Tmp_land', N'land', 'OBJECT' 
+
+ALTER TABLE dbo.land ADD CONSTRAINT
+        PK__land__65A475E71BFD2C07 PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+
+:VERSION 18
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_landaccesslist
+        (
+        LandUUID uniqueidentifier NULL,
+        AccessUUID uniqueidentifier NULL,
+        Flags int NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.landaccesslist)
+         EXEC('INSERT INTO dbo.Tmp_landaccesslist (LandUUID, AccessUUID, Flags)
+                SELECT CONVERT(uniqueidentifier, LandUUID), CONVERT(uniqueidentifier, AccessUUID), Flags FROM dbo.landaccesslist WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.landaccesslist
+
+EXECUTE sp_rename N'dbo.Tmp_landaccesslist', N'landaccesslist', 'OBJECT' 
+
+COMMIT
+
+
+
+:VERSION 19
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_regionban
+        (
+        regionUUID uniqueidentifier NOT NULL,
+        bannedUUID uniqueidentifier NOT NULL,
+        bannedIp varchar(16) NOT NULL,
+        bannedIpHostMask varchar(16) NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.regionban)
+         EXEC('INSERT INTO dbo.Tmp_regionban (regionUUID, bannedUUID, bannedIp, bannedIpHostMask)
+                SELECT CONVERT(uniqueidentifier, regionUUID), CONVERT(uniqueidentifier, bannedUUID), bannedIp, bannedIpHostMask FROM dbo.regionban WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.regionban
+
+EXECUTE sp_rename N'dbo.Tmp_regionban', N'regionban', 'OBJECT' 
+
+COMMIT
+
+
+:VERSION 20
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_regionsettings
+        (
+        regionUUID uniqueidentifier NOT NULL,
+        block_terraform bit NOT NULL,
+        block_fly bit NOT NULL,
+        allow_damage bit NOT NULL,
+        restrict_pushing bit NOT NULL,
+        allow_land_resell bit NOT NULL,
+        allow_land_join_divide bit NOT NULL,
+        block_show_in_search bit NOT NULL,
+        agent_limit int NOT NULL,
+        object_bonus float(53) NOT NULL,
+        maturity int NOT NULL,
+        disable_scripts bit NOT NULL,
+        disable_collisions bit NOT NULL,
+        disable_physics bit NOT NULL,
+        terrain_texture_1 uniqueidentifier NOT NULL,
+        terrain_texture_2 uniqueidentifier NOT NULL,
+        terrain_texture_3 uniqueidentifier NOT NULL,
+        terrain_texture_4 uniqueidentifier NOT NULL,
+        elevation_1_nw float(53) NOT NULL,
+        elevation_2_nw float(53) NOT NULL,
+        elevation_1_ne float(53) NOT NULL,
+        elevation_2_ne float(53) NOT NULL,
+        elevation_1_se float(53) NOT NULL,
+        elevation_2_se float(53) NOT NULL,
+        elevation_1_sw float(53) NOT NULL,
+        elevation_2_sw float(53) NOT NULL,
+        water_height float(53) NOT NULL,
+        terrain_raise_limit float(53) NOT NULL,
+        terrain_lower_limit float(53) NOT NULL,
+        use_estate_sun bit NOT NULL,
+        fixed_sun bit NOT NULL,
+        sun_position float(53) NOT NULL,
+        covenant uniqueidentifier NULL DEFAULT (NULL),
+        Sandbox bit NOT NULL,
+        sunvectorx float(53) NOT NULL DEFAULT ((0)),
+        sunvectory float(53) NOT NULL DEFAULT ((0)),
+        sunvectorz float(53) NOT NULL DEFAULT ((0))
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.regionsettings)
+         EXEC('INSERT INTO dbo.Tmp_regionsettings (regionUUID, block_terraform, block_fly, allow_damage, restrict_pushing, allow_land_resell, allow_land_join_divide, block_show_in_search, agent_limit, object_bonus, maturity, disable_scripts, disable_collisions, disable_physics, terrain_texture_1, terrain_texture_2, terrain_texture_3, terrain_texture_4, elevation_1_nw, elevation_2_nw, elevation_1_ne, elevation_2_ne, elevation_1_se, elevation_2_se, elevation_1_sw, elevation_2_sw, water_height, terrain_raise_limit, terrain_lower_limit, use_estate_sun, fixed_sun, sun_position, covenant, Sandbox, sunvectorx, sunvectory, sunvectorz)
+                SELECT CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, terrain_texture_1), CONVERT(uniqueidentifier, terrain_texture_2), CONVERT(uniqueidentifier, terrain_texture_3), CONVERT(uniqueidentifier, 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, CONVERT(uniqueidentifier, covenant), Sandbox, sunvectorx, sunvectory, sunvectorz FROM dbo.regionsettings WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.regionsettings
+
+EXECUTE sp_rename N'dbo.Tmp_regionsettings', N'regionsettings', 'OBJECT' 
+
+ALTER TABLE dbo.regionsettings ADD CONSTRAINT
+        PK__regionse__5B35159D21B6055D PRIMARY KEY CLUSTERED 
+        (
+        regionUUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 21
+
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD PassTouches bit not null default 0
+
+COMMIT
+
+
+:VERSION 22
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings ADD loaded_creation_date varchar(20) 
+ALTER TABLE regionsettings ADD loaded_creation_time varchar(20) 
+ALTER TABLE regionsettings ADD loaded_creation_id varchar(64) 
+
+COMMIT
+
+:VERSION 23
+
+BEGIN TRANSACTION
+
+ALTER TABLE regionsettings DROP COLUMN loaded_creation_date
+ALTER TABLE regionsettings DROP COLUMN loaded_creation_time
+ALTER TABLE regionsettings ADD loaded_creation_datetime int NOT NULL default 0
+
+COMMIT
+
+
+
diff --git a/OpenSim/Data/MSSQL/Resources/UserAccount.migrations b/OpenSim/Data/MSSQL/Resources/UserAccount.migrations
new file mode 100644
index 0000000..8534e23
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/UserAccount.migrations
@@ -0,0 +1,55 @@
+:VERSION 1
+
+CREATE TABLE [UserAccounts] (
+  [PrincipalID] uniqueidentifier NOT NULL,
+  [ScopeID] uniqueidentifier NOT NULL,
+  [FirstName] [varchar](64) NOT NULL,
+  [LastName] [varchar](64) NOT NULL,
+  [Email] [varchar](64) NULL,
+  [ServiceURLs] [text] NULL,
+  [Created] [int] default NULL,
+  
+  PRIMARY KEY CLUSTERED
+(
+        [PrincipalID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, 
+username AS FirstName, 
+lastname AS LastName, 
+email as Email, (
+'AssetServerURI=' +  
+userAssetURI + ' InventoryServerURI='  + userInventoryURI + ' GatewayURI= HomeURI=') AS ServiceURLs, 
+created as Created FROM users;
+
+
+COMMIT
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE UNIQUE INDEX PrincipalID ON UserAccounts(PrincipalID);
+CREATE INDEX Email ON UserAccounts(Email);
+CREATE INDEX FirstName ON UserAccounts(FirstName);
+CREATE INDEX LastName ON UserAccounts(LastName);
+CREATE INDEX Name ON UserAccounts(FirstName,LastName);
+
+COMMIT
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+ALTER TABLE UserAccounts ADD UserLevel integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD UserFlags integer NOT NULL DEFAULT 0;
+ALTER TABLE UserAccounts ADD UserTitle varchar(64) NOT NULL DEFAULT '';
+
+COMMIT
+
diff --git a/OpenSim/Data/MSSQL/Resources/UserStore.migrations b/OpenSim/Data/MSSQL/Resources/UserStore.migrations
new file mode 100644
index 0000000..050c544
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/UserStore.migrations
@@ -0,0 +1,421 @@
+:VERSION 1
+
+CREATE TABLE [users] (
+  [UUID] [varchar](36) NOT NULL default '',
+  [username] [varchar](32) NOT NULL,
+  [lastname] [varchar](32) NOT NULL,
+  [passwordHash] [varchar](32) NOT NULL,
+  [passwordSalt] [varchar](32) NOT NULL,
+  [homeRegion] [bigint] default NULL,
+  [homeLocationX] [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] NOT NULL,
+  [lastLogin] [int] NOT NULL,
+  [userInventoryURI] [varchar](255) default NULL,
+  [userAssetURI] [varchar](255) default NULL,
+  [profileCanDoMask] [int] default NULL,
+  [profileWantDoMask] [int] default NULL,
+  [profileAboutText] [ntext],
+  [profileFirstText] [ntext],
+  [profileImage] [varchar](36) default NULL,
+  [profileFirstImage] [varchar](36) default NULL,
+  [webLoginKey] [varchar](36) default NULL,
+  PRIMARY KEY CLUSTERED
+(
+        [UUID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX [usernames] ON [users]
+(
+        [username] ASC,
+        [lastname] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+
+CREATE TABLE [agents] (
+  [UUID] [varchar](36) NOT NULL,
+  [sessionID] [varchar](36) NOT NULL,
+  [secureSessionID] [varchar](36) NOT NULL,
+  [agentIP] [varchar](16) NOT NULL,
+  [agentPort] [int] NOT NULL,
+  [agentOnline] [tinyint] NOT NULL,
+  [loginTime] [int] NOT NULL,
+  [logoutTime] [int] NOT NULL,
+  [currentRegion] [varchar](36) NOT NULL,
+  [currentHandle] [bigint] NOT NULL,
+  [currentPos] [varchar](64) NOT NULL,
+  PRIMARY KEY CLUSTERED
+(
+        [UUID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+CREATE NONCLUSTERED INDEX [session] ON [agents]
+(
+        [sessionID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX [ssession] ON [agents]
+(
+        [secureSessionID] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+
+
+CREATE TABLE [dbo].[userfriends](
+        [ownerID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
+        [friendID] [varchar](50) COLLATE Latin1_General_CI_AS NOT NULL,
+        [friendPerms] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+        [datetimestamp] [nvarchar](50) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL
+) ON [PRIMARY]
+
+CREATE TABLE [avatarappearance]  (
+  [Owner]  [varchar](36) NOT NULL,
+  [Serial]  int NOT NULL,
+  [Visual_Params] [image] NOT NULL,
+  [Texture] [image] NOT NULL,
+  [Avatar_Height] float NOT NULL,
+  [Body_Item] [varchar](36) NOT NULL,
+  [Body_Asset] [varchar](36) NOT NULL,
+  [Skin_Item] [varchar](36) NOT NULL,
+  [Skin_Asset] [varchar](36) NOT NULL,
+  [Hair_Item] [varchar](36) NOT NULL,
+  [Hair_Asset] [varchar](36) NOT NULL,
+  [Eyes_Item] [varchar](36) NOT NULL,
+  [Eyes_Asset] [varchar](36) NOT NULL,
+  [Shirt_Item] [varchar](36) NOT NULL,
+  [Shirt_Asset] [varchar](36) NOT NULL,
+  [Pants_Item] [varchar](36) NOT NULL,
+  [Pants_Asset] [varchar](36) NOT NULL,
+  [Shoes_Item] [varchar](36) NOT NULL,
+  [Shoes_Asset] [varchar](36) NOT NULL,
+  [Socks_Item] [varchar](36) NOT NULL,
+  [Socks_Asset] [varchar](36) NOT NULL,
+  [Jacket_Item] [varchar](36) NOT NULL,
+  [Jacket_Asset] [varchar](36) NOT NULL,
+  [Gloves_Item] [varchar](36) NOT NULL,
+  [Gloves_Asset] [varchar](36) NOT NULL,
+  [Undershirt_Item] [varchar](36) NOT NULL,
+  [Undershirt_Asset] [varchar](36) NOT NULL,
+  [Underpants_Item] [varchar](36) NOT NULL,
+  [Underpants_Asset] [varchar](36) NOT NULL,
+  [Skirt_Item] [varchar](36) NOT NULL,
+  [Skirt_Asset] [varchar](36) NOT NULL,
+
+  PRIMARY KEY  CLUSTERED (
+  [Owner]
+  ) WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+:VERSION 2
+
+BEGIN TRANSACTION
+
+ALTER TABLE users ADD homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
+ALTER TABLE users ADD userFlags int NOT NULL default 0;
+ALTER TABLE users ADD godLevel int NOT NULL default 0;
+ALTER TABLE users ADD customType varchar(32) not null default '';
+ALTER TABLE users ADD partner varchar(36) not null default '00000000-0000-0000-0000-000000000000';
+
+COMMIT
+
+
+:VERSION 3
+
+BEGIN TRANSACTION
+
+CREATE TABLE [avatarattachments] (
+        [UUID] varchar(36) NOT NULL
+        , [attachpoint] int NOT NULL
+        , [item] varchar(36) NOT NULL
+        , [asset] varchar(36) NOT NULL)
+
+CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+
+COMMIT
+
+
+:VERSION 4
+
+BEGIN TRANSACTION
+
+CREATE TABLE Tmp_userfriends
+        (
+        ownerID varchar(36) NOT NULL,
+        friendID varchar(36) NOT NULL,
+        friendPerms int NOT NULL,
+        datetimestamp int NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM userfriends)
+         EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
+                SELECT CONVERT(varchar(36), ownerID), CONVERT(varchar(36), friendID), CONVERT(int, friendPerms), CONVERT(int, datetimestamp) FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.userfriends
+
+EXECUTE sp_rename N'Tmp_userfriends', N'userfriends', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON userfriends
+        (
+        ownerID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON userfriends
+        (
+        friendID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 5
+
+BEGIN TRANSACTION
+
+ ALTER TABLE users add email varchar(250);
+ 
+COMMIT
+
+
+:VERSION 6
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_users
+        (
+        UUID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        username varchar(32) NOT NULL,
+        lastname varchar(32) NOT NULL,
+        passwordHash varchar(32) NOT NULL,
+        passwordSalt varchar(32) NOT NULL,
+        homeRegion bigint NULL DEFAULT (NULL),
+        homeLocationX float(53) NULL DEFAULT (NULL),
+        homeLocationY float(53) NULL DEFAULT (NULL),
+        homeLocationZ float(53) NULL DEFAULT (NULL),
+        homeLookAtX float(53) NULL DEFAULT (NULL),
+        homeLookAtY float(53) NULL DEFAULT (NULL),
+        homeLookAtZ float(53) NULL DEFAULT (NULL),
+        created int NOT NULL,
+        lastLogin int NOT NULL,
+        userInventoryURI varchar(255) NULL DEFAULT (NULL),
+        userAssetURI varchar(255) NULL DEFAULT (NULL),
+        profileCanDoMask int NULL DEFAULT (NULL),
+        profileWantDoMask int NULL DEFAULT (NULL),
+        profileAboutText ntext NULL,
+        profileFirstText ntext NULL,
+        profileImage uniqueidentifier NULL DEFAULT (NULL),
+        profileFirstImage uniqueidentifier NULL DEFAULT (NULL),
+        webLoginKey uniqueidentifier NULL DEFAULT (NULL),
+        homeRegionID uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        userFlags int NOT NULL DEFAULT ((0)),
+        godLevel int NOT NULL DEFAULT ((0)),
+        customType varchar(32) NOT NULL DEFAULT (''),
+        partner uniqueidentifier NOT NULL DEFAULT ('00000000-0000-0000-0000-000000000000'),
+        email varchar(250) NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.users)
+         EXEC('INSERT INTO dbo.Tmp_users (UUID, username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, profileImage, profileFirstImage, webLoginKey, homeRegionID, userFlags, godLevel, customType, partner, email)
+                SELECT CONVERT(uniqueidentifier, UUID), username, lastname, passwordHash, passwordSalt, homeRegion, homeLocationX, homeLocationY, homeLocationZ, homeLookAtX, homeLookAtY, homeLookAtZ, created, lastLogin, userInventoryURI, userAssetURI, profileCanDoMask, profileWantDoMask, profileAboutText, profileFirstText, CONVERT(uniqueidentifier, profileImage), CONVERT(uniqueidentifier, profileFirstImage), CONVERT(uniqueidentifier, webLoginKey), CONVERT(uniqueidentifier, homeRegionID), userFlags, godLevel, customType, CONVERT(uniqueidentifier, partner), email FROM dbo.users WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.users
+
+EXECUTE sp_rename N'dbo.Tmp_users', N'users', 'OBJECT' 
+
+ALTER TABLE dbo.users ADD CONSTRAINT
+        PK__users__65A475E737A5467C PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX usernames ON dbo.users
+        (
+        username,
+        lastname
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 7
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_agents
+        (
+        UUID uniqueidentifier NOT NULL,
+        sessionID uniqueidentifier NOT NULL,
+        secureSessionID uniqueidentifier NOT NULL,
+        agentIP varchar(16) NOT NULL,
+        agentPort int NOT NULL,
+        agentOnline tinyint NOT NULL,
+        loginTime int NOT NULL,
+        logoutTime int NOT NULL,
+        currentRegion uniqueidentifier NOT NULL,
+        currentHandle bigint NOT NULL,
+        currentPos varchar(64) NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.agents)
+         EXEC('INSERT INTO dbo.Tmp_agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos)
+                SELECT CONVERT(uniqueidentifier, UUID), CONVERT(uniqueidentifier, sessionID), CONVERT(uniqueidentifier, secureSessionID), agentIP, agentPort, agentOnline, loginTime, logoutTime, CONVERT(uniqueidentifier, currentRegion), currentHandle, currentPos FROM dbo.agents WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.agents
+
+EXECUTE sp_rename N'dbo.Tmp_agents', N'agents', 'OBJECT' 
+
+ALTER TABLE dbo.agents ADD CONSTRAINT
+        PK__agents__65A475E749C3F6B7 PRIMARY KEY CLUSTERED 
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX session ON dbo.agents
+        (
+        sessionID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX ssession ON dbo.agents
+        (
+        secureSessionID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 8
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_userfriends
+        (
+        ownerID uniqueidentifier NOT NULL,
+        friendID uniqueidentifier NOT NULL,
+        friendPerms int NOT NULL,
+        datetimestamp int NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.userfriends)
+         EXEC('INSERT INTO dbo.Tmp_userfriends (ownerID, friendID, friendPerms, datetimestamp)
+                SELECT CONVERT(uniqueidentifier, ownerID), CONVERT(uniqueidentifier, friendID), friendPerms, datetimestamp FROM dbo.userfriends WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.userfriends
+
+EXECUTE sp_rename N'dbo.Tmp_userfriends', N'userfriends', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_userfriends_ownerID ON dbo.userfriends
+        (
+        ownerID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+CREATE NONCLUSTERED INDEX IX_userfriends_friendID ON dbo.userfriends
+        (
+        friendID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 9
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_avatarappearance
+        (
+        Owner uniqueidentifier NOT NULL,
+        Serial int NOT NULL,
+        Visual_Params image NOT NULL,
+        Texture image NOT NULL,
+        Avatar_Height float(53) NOT NULL,
+        Body_Item uniqueidentifier NOT NULL,
+        Body_Asset uniqueidentifier NOT NULL,
+        Skin_Item uniqueidentifier NOT NULL,
+        Skin_Asset uniqueidentifier NOT NULL,
+        Hair_Item uniqueidentifier NOT NULL,
+        Hair_Asset uniqueidentifier NOT NULL,
+        Eyes_Item uniqueidentifier NOT NULL,
+        Eyes_Asset uniqueidentifier NOT NULL,
+        Shirt_Item uniqueidentifier NOT NULL,
+        Shirt_Asset uniqueidentifier NOT NULL,
+        Pants_Item uniqueidentifier NOT NULL,
+        Pants_Asset uniqueidentifier NOT NULL,
+        Shoes_Item uniqueidentifier NOT NULL,
+        Shoes_Asset uniqueidentifier NOT NULL,
+        Socks_Item uniqueidentifier NOT NULL,
+        Socks_Asset uniqueidentifier NOT NULL,
+        Jacket_Item uniqueidentifier NOT NULL,
+        Jacket_Asset uniqueidentifier NOT NULL,
+        Gloves_Item uniqueidentifier NOT NULL,
+        Gloves_Asset uniqueidentifier NOT NULL,
+        Undershirt_Item uniqueidentifier NOT NULL,
+        Undershirt_Asset uniqueidentifier NOT NULL,
+        Underpants_Item uniqueidentifier NOT NULL,
+        Underpants_Asset uniqueidentifier NOT NULL,
+        Skirt_Item uniqueidentifier NOT NULL,
+        Skirt_Asset uniqueidentifier NOT NULL
+        )  ON [PRIMARY]
+         TEXTIMAGE_ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.avatarappearance)
+         EXEC('INSERT INTO dbo.Tmp_avatarappearance (Owner, Serial, Visual_Params, Texture, Avatar_Height, Body_Item, Body_Asset, Skin_Item, Skin_Asset, Hair_Item, Hair_Asset, Eyes_Item, Eyes_Asset, Shirt_Item, Shirt_Asset, Pants_Item, Pants_Asset, Shoes_Item, Shoes_Asset, Socks_Item, Socks_Asset, Jacket_Item, Jacket_Asset, Gloves_Item, Gloves_Asset, Undershirt_Item, Undershirt_Asset, Underpants_Item, Underpants_Asset, Skirt_Item, Skirt_Asset)
+                SELECT CONVERT(uniqueidentifier, Owner), Serial, Visual_Params, Texture, Avatar_Height, CONVERT(uniqueidentifier, Body_Item), CONVERT(uniqueidentifier, Body_Asset), CONVERT(uniqueidentifier, Skin_Item), CONVERT(uniqueidentifier, Skin_Asset), CONVERT(uniqueidentifier, Hair_Item), CONVERT(uniqueidentifier, Hair_Asset), CONVERT(uniqueidentifier, Eyes_Item), CONVERT(uniqueidentifier, Eyes_Asset), CONVERT(uniqueidentifier, Shirt_Item), CONVERT(uniqueidentifier, Shirt_Asset), CONVERT(uniqueidentifier, Pants_Item), CONVERT(uniqueidentifier, Pants_Asset), CONVERT(uniqueidentifier, Shoes_Item), CONVERT(uniqueidentifier, Shoes_Asset), CONVERT(uniqueidentifier, Socks_Item), CONVERT(uniqueidentifier, Socks_Asset), CONVERT(uniqueidentifier, Jacket_Item), CONVERT(uniqueidentifier, Jacket_Asset), CONVERT(uniqueidentifier, Gloves_Item), CONVERT(uniqueidentifier, Gloves_Asset), CONVERT(uniqueidentifier, Undershirt_Item), CONVERT(uniqueidentifier, Undershirt_Asset), CONVERT(uniqueidentifier, Underpants_Item), CONVERT(uniqueidentifier, Underpants_Asset), CONVERT(uniqueidentifier, Skirt_Item), CONVERT(uniqueidentifier, Skirt_Asset) FROM dbo.avatarappearance WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.avatarappearance
+
+EXECUTE sp_rename N'dbo.Tmp_avatarappearance', N'avatarappearance', 'OBJECT' 
+
+ALTER TABLE dbo.avatarappearance ADD CONSTRAINT
+        PK__avatarap__7DD115CC4E88ABD4 PRIMARY KEY CLUSTERED 
+        (
+        Owner
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 10
+
+BEGIN TRANSACTION
+
+CREATE TABLE dbo.Tmp_avatarattachments
+        (
+        UUID uniqueidentifier NOT NULL,
+        attachpoint int NOT NULL,
+        item uniqueidentifier NOT NULL,
+        asset uniqueidentifier NOT NULL
+        )  ON [PRIMARY]
+
+IF EXISTS(SELECT * FROM dbo.avatarattachments)
+         EXEC('INSERT INTO dbo.Tmp_avatarattachments (UUID, attachpoint, item, asset)
+                SELECT CONVERT(uniqueidentifier, UUID), attachpoint, CONVERT(uniqueidentifier, item), CONVERT(uniqueidentifier, asset) FROM dbo.avatarattachments WITH (HOLDLOCK TABLOCKX)')
+
+DROP TABLE dbo.avatarattachments
+
+EXECUTE sp_rename N'dbo.Tmp_avatarattachments', N'avatarattachments', 'OBJECT' 
+
+CREATE NONCLUSTERED INDEX IX_avatarattachments ON dbo.avatarattachments
+        (
+        UUID
+        ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+
+COMMIT
+
+
+:VERSION 11
+
+BEGIN TRANSACTION
+
+ALTER TABLE users ADD scopeID uniqueidentifier not null default '00000000-0000-0000-0000-000000000000'
+
+COMMIT
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 06defe4..4f113a2 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -72,59 +72,116 @@ namespace OpenSim.Data
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string _type;
-        private DbConnection _conn;
-        // private string _subtype;
-        private Assembly _assem;
-        private Regex _match;
+        protected string _type;
+        protected DbConnection _conn;
+        protected Assembly _assem;
 
-        private static readonly string _migrations_create = "create table migrations(name varchar(100), version int)";
-        // private static readonly string _migrations_init = "insert into migrations values('migrations', 1)";
-        // private static readonly string _migrations_find = "select version from migrations where name='migrations'";
+        private Regex _match_old;
+        private Regex _match_new;
 
+        /// <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. 
+        /// </summary>
+        public Migration()
+        { 
+        }
 
-        public Migration(DbConnection conn, Assembly assem, string type)
+        public Migration(DbConnection conn, Assembly assem, string subtype, string type)
         {
-            _type = type;
-            _conn = conn;
-            _assem = assem;
-            _match = new Regex(@"\.(\d\d\d)_" + _type + @"\.sql");
-            Initialize();
+            Initialize(conn, assem, type, subtype);
         }
 
-        public Migration(DbConnection conn, Assembly assem, string subtype, string type)
+        public Migration(DbConnection conn, Assembly assem, string type) 
+        {
+            Initialize(conn, assem, type, "");
+        }
+
+        /// <summary>Must be called after creating with the parameterless constructor.
+        /// NOTE that the Migration class now doesn't access database in any way during initialization.
+        /// Specifically, it won't check if the [migrations] table exists. Such checks are done later:
+        /// automatically on Update(), or you can explicitly call InitMigrationsTable().
+        /// </summary>
+        /// <param name="conn"></param>
+        /// <param name="assem"></param>
+        /// <param name="subtype"></param>
+        /// <param name="type"></param>
+        public void Initialize (DbConnection conn, Assembly assem, string type, string subtype)
         {
             _type = type;
             _conn = conn;
             _assem = assem;
-            _match = new Regex(subtype + @"\.(\d\d\d)_" + _type + @"\.sql");
-            Initialize();
+            _match_old = new Regex(subtype + @"\.(\d\d\d)_" + _type + @"\.sql");
+            string s = String.IsNullOrEmpty(subtype) ? _type : _type + @"\." + subtype;
+            _match_new = new Regex(@"\." + s + @"\.migrations(?:\.(?<ver>\d+)$|.*)");
         }
 
-        private void Initialize()
+        public void InitMigrationsTable()
         {
-            // clever, eh, we figure out which migrations version we are
-            int migration_version = FindVersion(_conn, "migrations");
-
-            if (migration_version > 0)
-                return;
+            // NOTE: normally when the [migrations] table is created, the version record for 'migrations' is
+            // added immediately. However, if for some reason the table is there but empty, we want to handle that as well.
+            int ver = FindVersion(_conn, "migrations");
+            if (ver <= 0)   // -1 = no table, 0 = no version record
+            {
+                if( ver < 0 )
+                    ExecuteScript("create table migrations(name varchar(100), version int)");
+                InsertVersion("migrations", 1);
+            }
+        }
 
-            // If not, create the migration tables
-            using (DbCommand cmd = _conn.CreateCommand())
+        /// <summary>Executes a script, possibly in a database-specific way.
+        /// It can be redefined for a specific DBMS, if necessary. Specifically,
+        /// to avoid problems with proc definitions in MySQL, we must use
+        /// MySqlScript class instead of just DbCommand. We don't want to bring
+        /// MySQL references here, so instead define a MySQLMigration class
+        /// in OpenSim.Data.MySQL
+        /// </summary>
+        /// <param name="conn"></param>
+        /// <param name="script">Array of strings, one-per-batch (often just one)</param>
+        protected virtual void ExecuteScript(DbConnection conn, string[] script)
+        {
+            using (DbCommand cmd = conn.CreateCommand())
             {
-                cmd.CommandText = _migrations_create;
-                cmd.ExecuteNonQuery();
+                cmd.CommandTimeout = 0;
+                foreach (string sql in script)
+                {
+                    cmd.CommandText = sql;
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch(Exception e)
+                    {
+                        throw new Exception(e.Message + " in SQL: " + sql);
+                    }
+                }
             }
+        }
 
-            InsertVersion("migrations", 1);
+        protected void ExecuteScript(DbConnection conn, string sql)
+        {
+            ExecuteScript(conn, new string[]{sql});
+        }
+
+        protected void ExecuteScript(string sql)
+        {
+            ExecuteScript(_conn, sql);
+        }
+
+        protected void ExecuteScript(string[] script)
+        {
+            ExecuteScript(_conn, script);
         }
 
+
+
         public void Update()
         {
-            int version = 0;
-            version = FindVersion(_conn, _type);
+            InitMigrationsTable();
 
-            SortedList<int, string> migrations = GetMigrationsAfter(version);
+            int version = FindVersion(_conn, _type);
+
+            SortedList<int, string[]> migrations = GetMigrationsAfter(version);
             if (migrations.Count < 1)
                 return;
 
@@ -132,57 +189,40 @@ namespace OpenSim.Data
             m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]);
             m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!");
 
-            using (DbCommand cmd = _conn.CreateCommand())
+            foreach (KeyValuePair<int, string[]> kvp in migrations)
             {
-                foreach (KeyValuePair<int, string> kvp in migrations)
+                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 
+                 * 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
+                 * a single string, but an array of strings, executed separately.
+                */
+                try
                 {
-                    int newversion = kvp.Key;
-                    cmd.CommandText = kvp.Value;
-                    // we need to up the command timeout to infinite as we might be doing long migrations.
-                    cmd.CommandTimeout = 0;
-                    try
-                    {
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
-                        m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
-                        cmd.CommandText = "ROLLBACK;";
-                        cmd.ExecuteNonQuery();
-                    }
+                    ExecuteScript(kvp.Value);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message.Replace("\n", " "));
+                    m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.");
+                    ExecuteScript("ROLLBACK;");
+                }
 
-                    if (version == 0)
-                    {
-                        InsertVersion(_type, newversion);
-                    }
-                    else
-                    {
-                        UpdateVersion(_type, newversion);
-                    }
-                    version = newversion;
+                if (version == 0)
+                {
+                    InsertVersion(_type, newversion);
                 }
+                else
+                {
+                    UpdateVersion(_type, newversion);
+                }
+                version = newversion;
             }
         }
 
-        // private int MaxVersion()
-        // {
-        //     int max = 0;
-        //     string[] names = _assem.GetManifestResourceNames();
-
-        //     foreach (string s in names)
-        //     {
-        //         Match m = _match.Match(s);
-        //         if (m.Success)
-        //         {
-        //             int MigrationVersion = int.Parse(m.Groups[1].ToString());
-        //             if (MigrationVersion > max)
-        //                 max = MigrationVersion;
-        //         }
-        //     }
-        //     return max;
-        // }
-
         public int Version
         {
             get { return FindVersion(_conn, _type); }
@@ -206,7 +246,7 @@ namespace OpenSim.Data
                 try
                 {
                     cmd.CommandText = "select version from migrations where name='" + type + "' order by version desc";
-                    using (IDataReader reader = cmd.ExecuteReader())
+                    using (DbDataReader reader = cmd.ExecuteReader())
                     {
                         if (reader.Read())
                         {
@@ -217,7 +257,8 @@ namespace OpenSim.Data
                 }
                 catch
                 {
-                    // Something went wrong, so we're version 0
+                    // Something went wrong (probably no table), so we're at version -1
+                    version = -1;
                 }
             }
             return version;
@@ -225,57 +266,151 @@ namespace OpenSim.Data
 
         private void InsertVersion(string type, int version)
         {
-            using (DbCommand cmd = _conn.CreateCommand())
-            {
-                cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")";
-                m_log.InfoFormat("[MIGRATIONS]: Creating {0} at version {1}", type, version);
-                cmd.ExecuteNonQuery();
-            }
+            m_log.InfoFormat("[MIGRATIONS]: Creating {0} at version {1}", type, version);
+            ExecuteScript("insert into migrations(name, version) values('" + type + "', " + version + ")");
         }
 
         private void UpdateVersion(string type, int version)
         {
-            using (DbCommand cmd = _conn.CreateCommand())
-            {
-                cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
-                m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
-                cmd.ExecuteNonQuery();
-            }
+            m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
+            ExecuteScript("update migrations set version=" + version + " where name='" + type + "'");
         }
 
-        // private SortedList<int, string> GetAllMigrations()
-        // {
-        //     return GetMigrationsAfter(0);
-        // }
+        private delegate void FlushProc();
 
-        private SortedList<int, string> GetMigrationsAfter(int after)
+        /// <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). 
+        /// 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.
+        /// </summary>
+        /// <param name="after">The version we are currently at. Scan for any higher versions</param>
+        /// <returns>A list of string arrays, representing the scripts.</returns>
+        private SortedList<int, string[]> GetMigrationsAfter(int after)
         {
+            SortedList<int, string[]> migrations = new SortedList<int, string[]>();
+
             string[] names = _assem.GetManifestResourceNames();
-            SortedList<int, string> migrations = new SortedList<int, string>();
-            // because life is funny if we don't
-            Array.Sort(names);
+            if( names.Length == 0 )     // should never happen
+                return migrations;
+
+            Array.Sort(names);  // we want all the migrations ordered
+
+            int nLastVerFound = 0;
+            Match m = null;
+            string sFile = Array.FindLast(names, nm => { m = _match_new.Match(nm); return m.Success; });  // ; nm.StartsWith(sPrefix, StringComparison.InvariantCultureIgnoreCase
+
+            if( (m != null) && !String.IsNullOrEmpty(sFile) )
+            {
+                /* 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 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 
+                 *  to come up in the correct order (e.g. 'SomeStore.migrations.001' rather than 'SomeStore.migrations.1')
+                 */
+
+                if (m.Groups.Count > 1 && int.TryParse(m.Groups[1].Value, out nLastVerFound))
+                {
+                    if( nLastVerFound <= after )
+                        goto scan_old_style;
+                }
+
+                System.Text.StringBuilder sb = new System.Text.StringBuilder(4096);
+                int nVersion = -1;
+
+                List<string> script = new List<string>();
+
+                FlushProc flush = delegate()
+                {
+                    if (sb.Length > 0)     // last SQL stmt to script list
+                    {
+                        script.Add(sb.ToString());
+                        sb.Length = 0;
+                    }
 
+                    if ( (nVersion > 0) && (nVersion > after) && (script.Count > 0) && !migrations.ContainsKey(nVersion))   // script to the versioned script list
+                    {
+                        migrations[nVersion] = script.ToArray();
+                    }
+                    script.Clear();
+                };
+
+                using (Stream resource = _assem.GetManifestResourceStream(sFile))
+                using (StreamReader resourceReader = new StreamReader(resource))
+                {
+                    int nLineNo = 0;
+                    while (!resourceReader.EndOfStream)
+                    {
+                        string sLine = resourceReader.ReadLine();
+                        nLineNo++;
+
+                        if( String.IsNullOrEmpty(sLine) || sLine.StartsWith("#") )  // ignore a comment or empty line
+                            continue;
+
+                        if (sLine.Trim().Equals(":GO", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            if (sb.Length == 0) continue;
+                            if (nVersion > after) 
+                                script.Add(sb.ToString());
+                            sb.Length = 0;
+                            continue;
+                        }
+
+                        if (sLine.StartsWith(":VERSION ", StringComparison.InvariantCultureIgnoreCase))  // ":VERSION nnn"
+                        {
+                            flush();
+
+                            int n = sLine.IndexOf('#');     // Comment is allowed in version sections, ignored
+                            if (n >= 0)
+                                sLine = sLine.Substring(0, n);
+
+                            if (!int.TryParse(sLine.Substring(9).Trim(), out nVersion))
+                            {
+                                m_log.ErrorFormat("[MIGRATIONS]: invalid version marker at {0}: line {1}. Migration failed!", sFile, nLineNo);
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            sb.AppendLine(sLine);
+                        }
+                    }
+                    flush();
+
+                    // If there are scattered migration files as well, only look for those with higher version numbers.
+                    if (after < nVersion)
+                        after = nVersion;
+                }
+            }
+
+scan_old_style:
+            // scan "old style" migration pieces anyway, ignore any versions already filled from the single file
             foreach (string s in names)
             {
-                Match m = _match.Match(s);
+                m = _match_old.Match(s);
                 if (m.Success)
                 {
                     int version = int.Parse(m.Groups[1].ToString());
-                    if (version > after)
+                    if ( (version > after) && !migrations.ContainsKey(version) )
                     {
                         using (Stream resource = _assem.GetManifestResourceStream(s))
                         {
                             using (StreamReader resourceReader = new StreamReader(resource))
                             {
-                                string resourceString = resourceReader.ReadToEnd();
-                                migrations.Add(version, resourceString);
+                                string sql = resourceReader.ReadToEnd();
+                                migrations.Add(version, new string[]{sql});
                             }
                         }
                     }
                 }
             }
-
-            if (migrations.Count < 1) {
+            
+            if (migrations.Count < 1) 
+            {
                 m_log.InfoFormat("[MIGRATIONS]: {0} up to date, no migrations to apply", _type);
             }
             return migrations;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 13f5fa2..fe5152a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -33,6 +33,7 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -111,7 +112,7 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
 
                     using (MySqlCommand cmd = new MySqlCommand(
-                        "SELECT name, description, assetType, local, temporary, asset_flags, data FROM assets WHERE id=?id",
+                        "SELECT name, description, assetType, local, temporary, asset_flags, CreatorID, data FROM assets WHERE id=?id",
                         dbcon))
                     {
                         cmd.Parameters.AddWithValue("?id", assetID.ToString());
@@ -122,7 +123,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 if (dbReader.Read())
                                 {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], UUID.Zero.ToString());
+                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], dbReader["CreatorID"].ToString());
                                     asset.Data = (byte[])dbReader["data"];
                                     asset.Description = (string)dbReader["description"];
 
@@ -162,8 +163,8 @@ namespace OpenSim.Data.MySQL
 
                     MySqlCommand cmd =
                         new MySqlCommand(
-                            "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, asset_flags, data)" +
-                            "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?asset_flags, ?data)",
+                            "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;
@@ -195,6 +196,7 @@ namespace OpenSim.Data.MySQL
                             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();
@@ -304,7 +306,7 @@ namespace OpenSim.Data.MySQL
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,assetType,temporary,id,asset_flags FROM assets LIMIT ?start, ?count", dbcon);
+                    MySqlCommand cmd = new MySqlCommand("SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count", dbcon);
                     cmd.Parameters.AddWithValue("?start", start);
                     cmd.Parameters.AddWithValue("?count", count);
 
@@ -320,7 +322,8 @@ namespace OpenSim.Data.MySQL
                                 metadata.Type = (sbyte)dbReader["assetType"];
                                 metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
                                 metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = new UUID((string)dbReader["id"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
 
                                 // Current SHA1s are not stored/computed.
                                 metadata.SHA1 = new byte[] { };
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 08e2144..9158f7a 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -34,6 +34,7 @@ using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -156,20 +157,13 @@ namespace OpenSim.Data.MySQL
 
                         foreach (string name in FieldList)
                         {
-                            if (m_FieldMap[name].GetValue(es) is bool)
+                            if (m_FieldMap[name].FieldType == typeof(bool))
                             {
-                                int v = Convert.ToInt32(r[name]);
-                                if (v != 0)
-                                    m_FieldMap[name].SetValue(es, true);
-                                else
-                                    m_FieldMap[name].SetValue(es, false);
+                                m_FieldMap[name].SetValue(es, Convert.ToInt32(r[name]) != 0);
                             }
-                            else if (m_FieldMap[name].GetValue(es) is UUID)
+                            else if (m_FieldMap[name].FieldType == typeof(UUID))
                             {
-                                UUID uuid = UUID.Zero;
-
-                                UUID.TryParse(r[name].ToString(), out uuid);
-                                m_FieldMap[name].SetValue(es, uuid);
+                                m_FieldMap[name].SetValue(es, DBGuid.FromDB(r[name]));
                             }
                             else
                             {
@@ -385,11 +379,7 @@ namespace OpenSim.Data.MySQL
                         while (r.Read())
                         {
                             // EstateBan eb = new EstateBan();
-
-                            UUID uuid = new UUID();
-                            UUID.TryParse(r["uuid"].ToString(), out uuid);
-
-                            uuids.Add(uuid);
+                            uuids.Add(DBGuid.FromDB(r["uuid"]));
                         }
                     }
                 }
@@ -490,7 +480,7 @@ namespace OpenSim.Data.MySQL
                         using (IDataReader reader = cmd.ExecuteReader())
                         {
                             while(reader.Read())
-                                result.Add(new UUID(reader["RegionID"].ToString()));
+                                result.Add(DBGuid.FromDB(reader["RegionID"]));
                             reader.Close();
                         }
                     }
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 1253e0b..6cbb2ee 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -148,19 +148,16 @@ namespace OpenSim.Data.MySQL
 
                         foreach (string name in m_Fields.Keys)
                         {
-                            if (m_Fields[name].GetValue(row) is bool)
+                            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].GetValue(row) is UUID)
+                            else if (m_Fields[name].FieldType == typeof(UUID))
                             {
-                                UUID uuid = UUID.Zero;
-
-                                UUID.TryParse(reader[name].ToString(), out uuid);
-                                m_Fields[name].SetValue(row, uuid);
+                                m_Fields[name].SetValue(row, DBGuid.FromDB(reader[name]));
                             }
-                            else if (m_Fields[name].GetValue(row) is int)
+                            else if (m_Fields[name].FieldType == typeof(int))
                             {
                                 int v = Convert.ToInt32(reader[name]);
                                 m_Fields[name].SetValue(row, v);
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index e0e9b9c..0aea30f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -32,6 +32,7 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -285,31 +286,23 @@ namespace OpenSim.Data.MySQL
                 InventoryItemBase item = new InventoryItemBase();
 
                 // 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.
-                if (reader["creatorID"] == null) 
-                {
-                    item.CreatorId  = UUID.Zero.ToString();
-                }
-                else
-                {
-                    item.CreatorId = (string)reader["creatorID"];
-                }
+                // ( 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
                 // db
-                UUID Owner = UUID.Zero;
-                UUID GroupID = UUID.Zero;
-                UUID.TryParse((string)reader["avatarID"], out Owner);
-                UUID.TryParse((string)reader["groupID"], out GroupID);
-                item.Owner = Owner;
-                item.GroupID = GroupID;
+
+                // (Empty is Ok, but "weird" will throw!)
+                item.Owner = DBGuid.FromDB(reader["avatarID"]);
+                item.GroupID = DBGuid.FromDB(reader["groupID"]);
 
                 // Rest of the parsing.  If these UUID's fail, we're dead anyway
-                item.ID = new UUID((string) reader["inventoryID"]);
-                item.AssetID = new UUID((string) reader["assetID"]);
+                item.ID = DBGuid.FromDB(reader["inventoryID"]);
+                item.AssetID = DBGuid.FromDB(reader["assetID"]);
                 item.AssetType = (int) reader["assetType"];
-                item.Folder = new UUID((string) reader["parentFolderID"]);
+                item.Folder = DBGuid.FromDB(reader["parentFolderID"]);
                 item.Name = (string)(reader["inventoryName"] ?? String.Empty);
                 item.Description = (string)(reader["inventoryDescription"] ?? String.Empty);
                 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
@@ -382,9 +375,9 @@ namespace OpenSim.Data.MySQL
             try
             {
                 InventoryFolderBase folder = new InventoryFolderBase();
-                folder.Owner = new UUID((string) reader["agentID"]);
-                folder.ParentID = new UUID((string) reader["parentFolderID"]);
-                folder.ID = new UUID((string) reader["folderID"]);
+                folder.Owner = DBGuid.FromDB(reader["agentID"]);
+                folder.ParentID = DBGuid.FromDB(reader["parentFolderID"]);
+                folder.ID = DBGuid.FromDB(reader["folderID"]);
                 folder.Name = (string) reader["folderName"];
                 folder.Type = (short) reader["type"];
                 folder.Version = (ushort) ((int) reader["version"]);
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 07371e7..bfeae12 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -38,6 +38,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -269,7 +270,7 @@ namespace OpenSim.Data.MySQL
                         using (IDataReader reader = ExecuteReader(cmd))
                         {
                             while (reader.Read())
-                                uuids.Add(new UUID(reader["UUID"].ToString()));
+                                uuids.Add(DBGuid.FromDB(reader["UUID"].ToString()));
                         }
 
                         // delete the main prims
@@ -422,7 +423,7 @@ namespace OpenSim.Data.MySQL
                                 else
                                     prim.Shape = BuildShape(reader);
 
-                                UUID parentID = new UUID(reader["SceneGroupID"].ToString());
+                                UUID parentID = DBGuid.FromDB(reader["SceneGroupID"].ToString());
                                 if (parentID != prim.UUID)
                                     prim.ParentUUID = parentID;
 
@@ -500,7 +501,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 if (!(itemReader["primID"] is DBNull))
                                 {
-                                    UUID primID = new UUID(itemReader["primID"].ToString());
+                                    UUID primID = DBGuid.FromDB(itemReader["primID"].ToString());
                                     if (prims.ContainsKey(primID))
                                         primsWithInventory.Add(prims[primID]);
                                 }
@@ -738,7 +739,7 @@ namespace OpenSim.Data.MySQL
                     }
                     else
                     {
-                        UUID.TryParse(result["region_id"].ToString(), out nWP.regionID);
+                        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"]);
@@ -1055,7 +1056,14 @@ namespace OpenSim.Data.MySQL
         private SceneObjectPart BuildPrim(IDataReader row)
         {
             SceneObjectPart prim = new SceneObjectPart();
-            prim.UUID = new UUID((string)row["UUID"]);
+
+            // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! 
+            prim.UUID = DBGuid.FromDB(row["UUID"]);
+            prim.CreatorID = DBGuid.FromDB(row["CreatorID"]);
+            prim.OwnerID = DBGuid.FromDB(row["OwnerID"]);
+            prim.GroupID = DBGuid.FromDB(row["GroupID"]);
+            prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]);
+
             // explicit conversion of integers is required, which sort
             // of sucks.  No idea if there is a shortcut here or not.
             prim.CreationDate = (int)row["CreationDate"];
@@ -1074,15 +1082,12 @@ namespace OpenSim.Data.MySQL
             prim.TouchName = (string)row["TouchName"];
             // Permissions
             prim.ObjectFlags = (uint)(int)row["ObjectFlags"];
-            prim.CreatorID = new UUID((string)row["CreatorID"]);
-            prim.OwnerID = new UUID((string)row["OwnerID"]);
-            prim.GroupID = new UUID((string)row["GroupID"]);
-            prim.LastOwnerID = new UUID((string)row["LastOwnerID"]);
             prim.OwnerMask = (uint)(int)row["OwnerMask"];
             prim.NextOwnerMask = (uint)(int)row["NextOwnerMask"];
             prim.GroupMask = (uint)(int)row["GroupMask"];
             prim.EveryoneMask = (uint)(int)row["EveryoneMask"];
             prim.BaseMask = (uint)(int)row["BaseMask"];
+
             // Vectors
             prim.OffsetPosition = new Vector3(
                 (float)(double)row["PositionX"],
@@ -1134,7 +1139,7 @@ namespace OpenSim.Data.MySQL
             prim.PayPrice[3] = (int)row["PayButton3"];
             prim.PayPrice[4] = (int)row["PayButton4"];
 
-            prim.Sound = new UUID(row["LoopedSound"].ToString());
+            prim.Sound = DBGuid.FromDB(row["LoopedSound"].ToString());
             prim.SoundGain = (float)(double)row["LoopedSoundGain"];
             prim.SoundFlags = 1; // If it's persisted at all, it's looped
 
@@ -1161,16 +1166,10 @@ namespace OpenSim.Data.MySQL
                 (float)(double)row["CameraAtOffsetZ"]
                 ));
 
-            if ((sbyte)row["ForceMouselook"] != 0)
-                prim.SetForceMouselook(true);
-
+            prim.SetForceMouselook((sbyte)row["ForceMouselook"] != 0);
             prim.ScriptAccessPin = (int)row["ScriptAccessPin"];
-
-            if ((sbyte)row["AllowedDrop"] != 0)
-                prim.AllowedDrop = true;
-
-            if ((sbyte)row["DieAtEdge"] != 0)
-                prim.DIE_AT_EDGE = true;
+            prim.AllowedDrop = ((sbyte)row["AllowedDrop"] != 0);
+            prim.DIE_AT_EDGE = ((sbyte)row["DieAtEdge"] != 0);
 
             prim.SalePrice = (int)row["SalePrice"];
             prim.ObjectSaleType = unchecked((byte)(sbyte)row["SaleType"]);
@@ -1180,11 +1179,10 @@ namespace OpenSim.Data.MySQL
             if (!(row["ClickAction"] is DBNull))
                 prim.ClickAction = unchecked((byte)(sbyte)row["ClickAction"]);
 
-            prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
+            prim.CollisionSound = DBGuid.FromDB(row["CollisionSound"]);
             prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
             
-            if ((sbyte)row["PassTouches"] != 0)
-                prim.PassTouches = true;
+            prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
 
             return prim;
@@ -1200,10 +1198,10 @@ namespace OpenSim.Data.MySQL
         {
             TaskInventoryItem taskItem = new TaskInventoryItem();
 
-            taskItem.ItemID        = new UUID((String)row["itemID"]);
-            taskItem.ParentPartID  = new UUID((String)row["primID"]);
-            taskItem.AssetID       = new UUID((String)row["assetID"]);
-            taskItem.ParentID      = new UUID((String)row["parentFolderID"]);
+            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"]);
@@ -1211,10 +1209,10 @@ namespace OpenSim.Data.MySQL
             taskItem.Name          = (String)row["name"];
             taskItem.Description   = (String)row["description"];
             taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorID     = new UUID((String)row["creatorID"]);
-            taskItem.OwnerID       = new UUID((String)row["ownerID"]);
-            taskItem.LastOwnerID   = new UUID((String)row["lastOwnerID"]);
-            taskItem.GroupID       = new UUID((String)row["groupID"]);
+            taskItem.CreatorID     = DBGuid.FromDB(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"]);
@@ -1230,7 +1228,7 @@ namespace OpenSim.Data.MySQL
         {
             RegionSettings newSettings = new RegionSettings();
 
-            newSettings.RegionUUID = new UUID((string) row["regionUUID"]);
+            newSettings.RegionUUID = DBGuid.FromDB(row["regionUUID"]);
             newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);
             newSettings.AllowDamage = Convert.ToBoolean(row["allow_damage"]);
             newSettings.BlockFly = Convert.ToBoolean(row["block_fly"]);
@@ -1244,10 +1242,10 @@ namespace OpenSim.Data.MySQL
             newSettings.DisableScripts = Convert.ToBoolean(row["disable_scripts"]);
             newSettings.DisableCollisions = Convert.ToBoolean(row["disable_collisions"]);
             newSettings.DisablePhysics = Convert.ToBoolean(row["disable_physics"]);
-            newSettings.TerrainTexture1 = new UUID((String) row["terrain_texture_1"]);
-            newSettings.TerrainTexture2 = new UUID((String) row["terrain_texture_2"]);
-            newSettings.TerrainTexture3 = new UUID((String) row["terrain_texture_3"]);
-            newSettings.TerrainTexture4 = new UUID((String) row["terrain_texture_4"]);
+            newSettings.TerrainTexture1 = DBGuid.FromDB(row["terrain_texture_1"]);
+            newSettings.TerrainTexture2 = DBGuid.FromDB(row["terrain_texture_2"]);
+            newSettings.TerrainTexture3 = DBGuid.FromDB(row["terrain_texture_3"]);
+            newSettings.TerrainTexture4 = DBGuid.FromDB(row["terrain_texture_4"]);
             newSettings.Elevation1NW = Convert.ToDouble(row["elevation_1_nw"]);
             newSettings.Elevation2NW = Convert.ToDouble(row["elevation_2_nw"]);
             newSettings.Elevation1NE = Convert.ToDouble(row["elevation_1_ne"]);
@@ -1268,7 +1266,7 @@ namespace OpenSim.Data.MySQL
                                                  );
             newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]);
             newSettings.SunPosition = Convert.ToDouble(row["sun_position"]);
-            newSettings.Covenant = new UUID((String) row["covenant"]);
+            newSettings.Covenant = DBGuid.FromDB(row["covenant"]);
 
             newSettings.LoadedCreationDateTime = Convert.ToInt32(row["loaded_creation_datetime"]);
             
@@ -1277,7 +1275,7 @@ namespace OpenSim.Data.MySQL
             else 
                 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
 
-            newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
+            newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]);
 
             return newSettings;
         }
@@ -1291,7 +1289,7 @@ namespace OpenSim.Data.MySQL
         {
             LandData newData = new LandData();
 
-            newData.GlobalID = new UUID((String) row["UUID"]);
+            newData.GlobalID = DBGuid.FromDB(row["UUID"]);
             newData.LocalID = Convert.ToInt32(row["LocalLandID"]);
 
             // Bitmap is a byte[512]
@@ -1299,7 +1297,7 @@ namespace OpenSim.Data.MySQL
 
             newData.Name = (String) row["Name"];
             newData.Description = (String) row["Description"];
-            newData.OwnerID = new UUID((String)row["OwnerUUID"]);
+            newData.OwnerID = DBGuid.FromDB(row["OwnerUUID"]);
             newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
             newData.Area = Convert.ToInt32(row["Area"]);
             newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unimplemented
@@ -1307,14 +1305,14 @@ namespace OpenSim.Data.MySQL
                 //Enum libsecondlife.Parcel.ParcelCategory
             newData.ClaimDate = Convert.ToInt32(row["ClaimDate"]);
             newData.ClaimPrice = Convert.ToInt32(row["ClaimPrice"]);
-            newData.GroupID = new UUID((String) row["GroupUUID"]);
+            newData.GroupID = DBGuid.FromDB(row["GroupUUID"]);
             newData.SalePrice = Convert.ToInt32(row["SalePrice"]);
             newData.Status = (ParcelStatus) Convert.ToInt32(row["LandStatus"]);
                 //Enum. libsecondlife.Parcel.ParcelStatus
             newData.Flags = Convert.ToUInt32(row["LandFlags"]);
             newData.LandingType = Convert.ToByte(row["LandingType"]);
             newData.MediaAutoScale = Convert.ToByte(row["MediaAutoScale"]);
-            newData.MediaID = new UUID((String) row["MediaTextureUUID"]);
+            newData.MediaID = DBGuid.FromDB(row["MediaTextureUUID"]);
             newData.MediaURL = (String) row["MediaURL"];
             newData.MusicURL = (String) row["MusicURL"];
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
@@ -1358,7 +1356,7 @@ namespace OpenSim.Data.MySQL
         private static ParcelManager.ParcelAccessEntry BuildLandAccessData(IDataReader row)
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-            entry.AgentID = new UUID((string) row["AccessUUID"]);
+            entry.AgentID = DBGuid.FromDB(row["AccessUUID"]);
             entry.Flags = (AccessList) Convert.ToInt32(row["Flags"]);
             entry.Time = new DateTime();
             return entry;
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
new file mode 100644
index 0000000..81a0e83
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -0,0 +1,83 @@
+/*
+ * 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.Data.Common;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using log4net;
+using MySql.Data.MySqlClient;
+
+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) : 
+            base(conn, assem, subtype, type)
+        {
+        }
+
+        public MySqlMigration(DbConnection conn, Assembly assem, string type) :
+            base(conn, assem, type)
+        {
+        }
+
+        protected override void ExecuteScript(DbConnection conn, string[] script)
+        {
+            if (!(conn is MySqlConnection))
+            {
+                base.ExecuteScript(conn, script);
+                return;
+            }
+
+            MySqlScript scr = new MySqlScript((MySqlConnection)conn);
+            {
+                foreach (string sql in script)
+                {
+                    scr.Query = sql;
+                    scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args)
+                    {
+                        throw new Exception(sql);
+                    };
+                    scr.Execute();
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index aa9a104..c7bddac 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
@@ -143,12 +144,9 @@ namespace OpenSim.Data.MySQL
                         RegionData ret = new RegionData();
                         ret.Data = new Dictionary<string, object>();
 
-                        UUID regionID;
-                        UUID.TryParse(result["uuid"].ToString(), out regionID);
-                        ret.RegionID = regionID;
-                        UUID scope;
-                        UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                        ret.ScopeID = scope;
+                        ret.RegionID = DBGuid.FromDB(result["uuid"]);
+                        ret.ScopeID = DBGuid.FromDB(result["ScopeID"]);
+
                         ret.RegionName = result["regionName"].ToString();
                         ret.posX = Convert.ToInt32(result["locX"]);
                         ret.posY = Convert.ToInt32(result["locY"]);
diff --git a/OpenSim/Data/MySQL/Resources/001_AssetStore.sql b/OpenSim/Data/MySQL/Resources/001_AssetStore.sql
deleted file mode 100644
index 6a9a127..0000000
--- a/OpenSim/Data/MySQL/Resources/001_AssetStore.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-BEGIN;
-
-CREATE TABLE `assets` (
-  `id` binary(16) NOT NULL,
-  `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,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_Avatar.sql b/OpenSim/Data/MySQL/Resources/001_Avatar.sql
deleted file mode 100644
index 27a3072..0000000
--- a/OpenSim/Data/MySQL/Resources/001_Avatar.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/001_Friends.sql b/OpenSim/Data/MySQL/Resources/001_Friends.sql
deleted file mode 100644
index e158a2c..0000000
--- a/OpenSim/Data/MySQL/Resources/001_Friends.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-BEGIN;
-
-CREATE TABLE `Friends` (
-    `PrincipalID` CHAR(36) NOT NULL,
-    `FriendID` VARCHAR(255) NOT NULL,
-    `Flags` CHAR(16) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_FriendsStore.sql b/OpenSim/Data/MySQL/Resources/001_FriendsStore.sql
deleted file mode 100644
index da2c59c..0000000
--- a/OpenSim/Data/MySQL/Resources/001_FriendsStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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`));
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql b/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql
deleted file mode 100644
index 40dc91c..0000000
--- a/OpenSim/Data/MySQL/Resources/001_InventoryStore.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-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=InnoDB 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=InnoDB DEFAULT CHARSET=utf8;
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_RegionStore.sql b/OpenSim/Data/MySQL/Resources/001_RegionStore.sql
deleted file mode 100644
index 31164b3..0000000
--- a/OpenSim/Data/MySQL/Resources/001_RegionStore.sql
+++ /dev/null
@@ -1,154 +0,0 @@
-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,
-  `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,
-  `Heightfield` longblob
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
-CREATE TABLE `land` (
-  `UUID` varchar(255) NOT 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=InnoDB 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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/001_UserAccount.sql b/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
deleted file mode 100644
index 07da571..0000000
--- a/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-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=InnoDB DEFAULT CHARSET=utf8;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_AssetStore.sql b/OpenSim/Data/MySQL/Resources/002_AssetStore.sql
deleted file mode 100644
index a7d7fca..0000000
--- a/OpenSim/Data/MySQL/Resources/002_AssetStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/002_AuthStore.sql b/OpenSim/Data/MySQL/Resources/002_AuthStore.sql
deleted file mode 100644
index dc7dfe0..0000000
--- a/OpenSim/Data/MySQL/Resources/002_AuthStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey) SELECT `UUID` AS UUID, `passwordHash` AS passwordHash, `passwordSalt` AS passwordSalt, `webLoginKey` AS webLoginKey FROM users;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Friends.sql b/OpenSim/Data/MySQL/Resources/002_Friends.sql
deleted file mode 100644
index 5ff6438..0000000
--- a/OpenSim/Data/MySQL/Resources/002_Friends.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-INSERT INTO Friends (PrincipalID, FriendID, Flags) SELECT ownerID, friendID, friendPerms FROM userfriends;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_FriendsStore.sql b/OpenSim/Data/MySQL/Resources/002_FriendsStore.sql
deleted file mode 100644
index a363867..0000000
--- a/OpenSim/Data/MySQL/Resources/002_FriendsStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_GridStore.sql b/OpenSim/Data/MySQL/Resources/002_GridStore.sql
deleted file mode 100644
index 35b9be1..0000000
--- a/OpenSim/Data/MySQL/Resources/002_GridStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE regions add column access integer unsigned default 1;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_InventoryStore.sql b/OpenSim/Data/MySQL/Resources/002_InventoryStore.sql
deleted file mode 100644
index c161a68..0000000
--- a/OpenSim/Data/MySQL/Resources/002_InventoryStore.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/002_RegionStore.sql b/OpenSim/Data/MySQL/Resources/002_RegionStore.sql
deleted file mode 100644
index 45bf959..0000000
--- a/OpenSim/Data/MySQL/Resources/002_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-CREATE index prims_regionuuid on prims(RegionUUID);
-CREATE index primitems_primid on primitems(primID);
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/002_UserAccount.sql b/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
deleted file mode 100644
index ad2ddda..0000000
--- a/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_UserStore.sql b/OpenSim/Data/MySQL/Resources/002_UserStore.sql
deleted file mode 100644
index 393cea0..0000000
--- a/OpenSim/Data/MySQL/Resources/002_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add homeRegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_AssetStore.sql b/OpenSim/Data/MySQL/Resources/003_AssetStore.sql
deleted file mode 100644
index d489278..0000000
--- a/OpenSim/Data/MySQL/Resources/003_AssetStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/003_AuthStore.sql b/OpenSim/Data/MySQL/Resources/003_AuthStore.sql
deleted file mode 100644
index af9ffe6..0000000
--- a/OpenSim/Data/MySQL/Resources/003_AuthStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE `auth` ADD COLUMN `accountType` VARCHAR(32) NOT NULL DEFAULT 'UserAccount';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_GridStore.sql b/OpenSim/Data/MySQL/Resources/003_GridStore.sql
deleted file mode 100644
index bc3fe7d..0000000
--- a/OpenSim/Data/MySQL/Resources/003_GridStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-BEGIN;
-
-ALTER TABLE regions add column ScopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-create index ScopeID on regions(ScopeID);
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_InventoryStore.sql b/OpenSim/Data/MySQL/Resources/003_InventoryStore.sql
deleted file mode 100644
index 4c6da91..0000000
--- a/OpenSim/Data/MySQL/Resources/003_InventoryStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_RegionStore.sql b/OpenSim/Data/MySQL/Resources/003_RegionStore.sql
deleted file mode 100644
index cb0a614..0000000
--- a/OpenSim/Data/MySQL/Resources/003_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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=INNODB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/003_UserAccount.sql b/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
deleted file mode 100644
index e42d93b..0000000
--- a/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/003_UserStore.sql b/OpenSim/Data/MySQL/Resources/003_UserStore.sql
deleted file mode 100644
index 6f890ee..0000000
--- a/OpenSim/Data/MySQL/Resources/003_UserStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add userFlags integer NOT NULL default 0;
-ALTER TABLE users add godLevel integer NOT NULL default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/004_AssetStore.sql b/OpenSim/Data/MySQL/Resources/004_AssetStore.sql
deleted file mode 100644
index ae1951d..0000000
--- a/OpenSim/Data/MySQL/Resources/004_AssetStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE assets drop InvType;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/004_GridStore.sql b/OpenSim/Data/MySQL/Resources/004_GridStore.sql
deleted file mode 100644
index 2238a88..0000000
--- a/OpenSim/Data/MySQL/Resources/004_GridStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE regions add column sizeX integer not null default 0;
-ALTER TABLE regions add column sizeY integer not null default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/004_InventoryStore.sql b/OpenSim/Data/MySQL/Resources/004_InventoryStore.sql
deleted file mode 100644
index c45f773..0000000
--- a/OpenSim/Data/MySQL/Resources/004_InventoryStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/004_RegionStore.sql b/OpenSim/Data/MySQL/Resources/004_RegionStore.sql
deleted file mode 100644
index 4db2f75..0000000
--- a/OpenSim/Data/MySQL/Resources/004_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE primitems add flags integer not null default 0;
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/004_UserAccount.sql b/OpenSim/Data/MySQL/Resources/004_UserAccount.sql
deleted file mode 100644
index 8abcd53..0000000
--- a/OpenSim/Data/MySQL/Resources/004_UserAccount.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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/004_UserStore.sql b/OpenSim/Data/MySQL/Resources/004_UserStore.sql
deleted file mode 100644
index 03142af..0000000
--- a/OpenSim/Data/MySQL/Resources/004_UserStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/005_AssetStore.sql b/OpenSim/Data/MySQL/Resources/005_AssetStore.sql
deleted file mode 100644
index bfeb652..0000000
--- a/OpenSim/Data/MySQL/Resources/005_AssetStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE assets add create_time integer default 0;
-ALTER TABLE assets add access_time integer default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/005_GridStore.sql b/OpenSim/Data/MySQL/Resources/005_GridStore.sql
deleted file mode 100644
index 835ba89..0000000
--- a/OpenSim/Data/MySQL/Resources/005_GridStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE `regions` ADD COLUMN `flags` integer NOT NULL DEFAULT 0;
-CREATE INDEX flags ON regions(flags);
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/005_RegionStore.sql b/OpenSim/Data/MySQL/Resources/005_RegionStore.sql
deleted file mode 100644
index c4a9527..0000000
--- a/OpenSim/Data/MySQL/Resources/005_RegionStore.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/005_UserStore.sql b/OpenSim/Data/MySQL/Resources/005_UserStore.sql
deleted file mode 100644
index 55896bc..0000000
--- a/OpenSim/Data/MySQL/Resources/005_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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=InnoDB;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/006_AssetStore.sql b/OpenSim/Data/MySQL/Resources/006_AssetStore.sql
deleted file mode 100644
index 3104353..0000000
--- a/OpenSim/Data/MySQL/Resources/006_AssetStore.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM assets WHERE id = 'dc4b9f0b-d008-45c6-96a4-01dd947ac621'
diff --git a/OpenSim/Data/MySQL/Resources/006_GridStore.sql b/OpenSim/Data/MySQL/Resources/006_GridStore.sql
deleted file mode 100644
index 91322d6..0000000
--- a/OpenSim/Data/MySQL/Resources/006_GridStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE `regions` ADD COLUMN `last_seen` integer NOT NULL DEFAULT 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/006_RegionStore.sql b/OpenSim/Data/MySQL/Resources/006_RegionStore.sql
deleted file mode 100644
index c1ba5b8..0000000
--- a/OpenSim/Data/MySQL/Resources/006_RegionStore.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN;
-
-alter table landaccesslist ENGINE = InnoDB;
-alter table migrations ENGINE = InnoDB;
-alter table primitems ENGINE = InnoDB;
-alter table prims ENGINE = InnoDB;
-alter table primshapes ENGINE = InnoDB;
-alter table regionsettings ENGINE = InnoDB;
-alter table terrain ENGINE = InnoDB;
-
-COMMIT;
-
diff --git a/OpenSim/Data/MySQL/Resources/006_UserStore.sql b/OpenSim/Data/MySQL/Resources/006_UserStore.sql
deleted file mode 100644
index 10b321e..0000000
--- a/OpenSim/Data/MySQL/Resources/006_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE agents add currentLookAt varchar(36) not null default '';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/007_AssetStore.sql b/OpenSim/Data/MySQL/Resources/007_AssetStore.sql
deleted file mode 100644
index f06121a..0000000
--- a/OpenSim/Data/MySQL/Resources/007_AssetStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/007_GridStore.sql b/OpenSim/Data/MySQL/Resources/007_GridStore.sql
deleted file mode 100644
index dbec584..0000000
--- a/OpenSim/Data/MySQL/Resources/007_GridStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/MySQL/Resources/007_RegionStore.sql b/OpenSim/Data/MySQL/Resources/007_RegionStore.sql
deleted file mode 100644
index 404d248..0000000
--- a/OpenSim/Data/MySQL/Resources/007_RegionStore.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/007_UserStore.sql b/OpenSim/Data/MySQL/Resources/007_UserStore.sql
deleted file mode 100644
index 3ab5261..0000000
--- a/OpenSim/Data/MySQL/Resources/007_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add email varchar(250);
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/008_RegionStore.sql b/OpenSim/Data/MySQL/Resources/008_RegionStore.sql
deleted file mode 100644
index 7bc61c0..0000000
--- a/OpenSim/Data/MySQL/Resources/008_RegionStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/008_UserStore.sql b/OpenSim/Data/MySQL/Resources/008_UserStore.sql
deleted file mode 100644
index 4500bd5..0000000
--- a/OpenSim/Data/MySQL/Resources/008_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add scopeID char(36) not null default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/009_RegionStore.sql b/OpenSim/Data/MySQL/Resources/009_RegionStore.sql
deleted file mode 100644
index 284732a..0000000
--- a/OpenSim/Data/MySQL/Resources/009_RegionStore.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/010_RegionStore.sql b/OpenSim/Data/MySQL/Resources/010_RegionStore.sql
deleted file mode 100644
index 031a746..0000000
--- a/OpenSim/Data/MySQL/Resources/010_RegionStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-# 1 "010_RegionStore.sql"
-# 1 "<built-in>"
-# 1 "<command line>"
-# 1 "010_RegionStore.sql"
-BEGIN;
-
-DELETE FROM regionsettings;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/011_RegionStore.sql b/OpenSim/Data/MySQL/Resources/011_RegionStore.sql
deleted file mode 100644
index ab01969..0000000
--- a/OpenSim/Data/MySQL/Resources/011_RegionStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/012_RegionStore.sql b/OpenSim/Data/MySQL/Resources/012_RegionStore.sql
deleted file mode 100644
index 95c2757..0000000
--- a/OpenSim/Data/MySQL/Resources/012_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims add index prims_parentid(ParentID);
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/013_RegionStore.sql b/OpenSim/Data/MySQL/Resources/013_RegionStore.sql
deleted file mode 100644
index a6bd30d..0000000
--- a/OpenSim/Data/MySQL/Resources/013_RegionStore.sql
+++ /dev/null
@@ -1,103 +0,0 @@
-begin;
-
-drop table regionsettings;
-
-CREATE TABLE `regionsettings` (
-  `regionUUID` char(36) NOT NULL,
-  `block_terraform` int(11) NOT NULL,
-  `block_fly` int(11) NOT NULL,
-  `allow_damage` int(11) NOT NULL,
-  `restrict_pushing` int(11) NOT NULL,
-  `allow_land_resell` int(11) NOT NULL,
-  `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,
-  `maturity` int(11) NOT NULL,
-  `disable_scripts` int(11) NOT NULL,
-  `disable_collisions` int(11) NOT NULL,
-  `disable_physics` int(11) 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` int(11) NOT NULL,
-  `fixed_sun` int(11) NOT NULL,
-  `sun_position` float NOT NULL,
-  `covenant` char(36) default NULL,
-  `Sandbox` tinyint(4) NOT NULL,
-  PRIMARY KEY  (`regionUUID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_managers` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_groups` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `estate_users` (
-  `EstateID` int(10) unsigned NOT NULL,
-  `uuid` char(36) NOT NULL,
-  KEY `EstateID` (`EstateID`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `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;
-
-CREATE TABLE `estate_settings` (
-  `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,
-  `FixedSun` tinyint(4) NOT NULL,
-  `DenyTransacted` tinyint(4) NOT NULL,
-  `BlockDwell` tinyint(4) NOT NULL,
-  `DenyIdentified` tinyint(4) NOT NULL,
-  `AllowVoice` tinyint(4) NOT NULL,
-  `UseGlobalTime` tinyint(4) NOT NULL,
-  `PricePerMeter` int(11) NOT NULL,
-  `TaxFree` tinyint(4) NOT NULL,
-  `AllowDirectTeleport` tinyint(4) NOT NULL,
-  `RedirectGridX` int(11) NOT NULL,
-  `RedirectGridY` int(11) NOT NULL,
-  `ParentEstateID` int(10) unsigned NOT NULL,
-  `SunPosition` double NOT NULL,
-  `EstateSkipScripts` tinyint(4) NOT NULL,
-  `BillableFactor` float NOT NULL,
-  `PublicAccess` tinyint(4) NOT NULL,
-  PRIMARY KEY  (`EstateID`)
-) ENGINE=InnoDB AUTO_INCREMENT=100;
-
-CREATE TABLE `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;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/014_RegionStore.sql b/OpenSim/Data/MySQL/Resources/014_RegionStore.sql
deleted file mode 100644
index 788fd63..0000000
--- a/OpenSim/Data/MySQL/Resources/014_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-begin;
-
-alter table estate_settings add column AbuseEmail varchar(255) not null;
-
-alter table estate_settings add column EstateOwner varchar(36) not null;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/015_RegionStore.sql b/OpenSim/Data/MySQL/Resources/015_RegionStore.sql
deleted file mode 100644
index 6d4f9f3..0000000
--- a/OpenSim/Data/MySQL/Resources/015_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-begin;
-
-alter table estate_settings add column DenyMinors tinyint not null;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/016_RegionStore.sql b/OpenSim/Data/MySQL/Resources/016_RegionStore.sql
deleted file mode 100644
index 9bc265e..0000000
--- a/OpenSim/Data/MySQL/Resources/016_RegionStore.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/017_RegionStore.sql b/OpenSim/Data/MySQL/Resources/017_RegionStore.sql
deleted file mode 100644
index 0304f30..0000000
--- a/OpenSim/Data/MySQL/Resources/017_RegionStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/018_RegionStore.sql b/OpenSim/Data/MySQL/Resources/018_RegionStore.sql
deleted file mode 100644
index 68c489c..0000000
--- a/OpenSim/Data/MySQL/Resources/018_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-begin;
-
-ALTER TABLE prims ADD COLUMN ClickAction tinyint NOT NULL default 0;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/019_RegionStore.sql b/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
deleted file mode 100644
index 4c14f2a..0000000
--- a/OpenSim/Data/MySQL/Resources/019_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-begin;
-
-ALTER TABLE prims ADD COLUMN Material tinyint NOT NULL default 3;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/020_RegionStore.sql b/OpenSim/Data/MySQL/Resources/020_RegionStore.sql
deleted file mode 100644
index 814ef48..0000000
--- a/OpenSim/Data/MySQL/Resources/020_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-begin;
-
-ALTER TABLE land ADD COLUMN OtherCleanTime integer NOT NULL default 0;
-ALTER TABLE land ADD COLUMN Dwell integer NOT NULL default 0;
-
-commit;
-
diff --git a/OpenSim/Data/MySQL/Resources/021_RegionStore.sql b/OpenSim/Data/MySQL/Resources/021_RegionStore.sql
deleted file mode 100644
index c59b27e..0000000
--- a/OpenSim/Data/MySQL/Resources/021_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/MySQL/Resources/022_RegionStore.sql b/OpenSim/Data/MySQL/Resources/022_RegionStore.sql
deleted file mode 100644
index df0bb7d..0000000
--- a/OpenSim/Data/MySQL/Resources/022_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/023_RegionStore.sql b/OpenSim/Data/MySQL/Resources/023_RegionStore.sql
deleted file mode 100644
index 559591f..0000000
--- a/OpenSim/Data/MySQL/Resources/023_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN LinkNumber integer not null default 0;
-
-COMMIT;
-
diff --git a/OpenSim/Data/MySQL/Resources/024_RegionStore.sql b/OpenSim/Data/MySQL/Resources/024_RegionStore.sql
deleted file mode 100644
index defbf5c..0000000
--- a/OpenSim/Data/MySQL/Resources/024_RegionStore.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/MySQL/Resources/025_RegionStore.sql b/OpenSim/Data/MySQL/Resources/025_RegionStore.sql
deleted file mode 100644
index e8f5d70..0000000
--- a/OpenSim/Data/MySQL/Resources/025_RegionStore.sql
+++ /dev/null
@@ -1,46 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/MySQL/Resources/026_RegionStore.sql b/OpenSim/Data/MySQL/Resources/026_RegionStore.sql
deleted file mode 100644
index 91af8a8..0000000
--- a/OpenSim/Data/MySQL/Resources/026_RegionStore.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/027_RegionStore.sql b/OpenSim/Data/MySQL/Resources/027_RegionStore.sql
deleted file mode 100644
index e1efab3..0000000
--- a/OpenSim/Data/MySQL/Resources/027_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims DROP COLUMN ParentID;
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/028_RegionStore.sql b/OpenSim/Data/MySQL/Resources/028_RegionStore.sql
deleted file mode 100644
index 078394f..0000000
--- a/OpenSim/Data/MySQL/Resources/028_RegionStore.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/029_RegionStore.sql b/OpenSim/Data/MySQL/Resources/029_RegionStore.sql
deleted file mode 100644
index b5962a2..0000000
--- a/OpenSim/Data/MySQL/Resources/029_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN PassTouches tinyint not null default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/030_RegionStore.sql b/OpenSim/Data/MySQL/Resources/030_RegionStore.sql
deleted file mode 100644
index dfdcf6d..0000000
--- a/OpenSim/Data/MySQL/Resources/030_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/031_RegionStore.sql b/OpenSim/Data/MySQL/Resources/031_RegionStore.sql
deleted file mode 100644
index d069296..0000000
--- a/OpenSim/Data/MySQL/Resources/031_RegionStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
diff --git a/OpenSim/Data/MySQL/Resources/032_RegionStore.sql b/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
deleted file mode 100644
index 02ac1f5..0000000
--- a/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
+++ /dev/null
@@ -1,71 +0,0 @@
-BEGIN;
-
-CREATE TABLE `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',
-  `water_color_b` float(9,6) unsigned NOT NULL DEFAULT '64.000000',
-  `water_fog_density_exponent` float(3,1) unsigned NOT NULL DEFAULT '4.0',
-  `underwater_fog_modifier` float(3,2) unsigned NOT NULL DEFAULT '0.25',
-  `reflection_wavelet_scale_1` float(3,1) unsigned NOT NULL DEFAULT '2.0',
-  `reflection_wavelet_scale_2` float(3,1) unsigned NOT NULL DEFAULT '2.0',
-  `reflection_wavelet_scale_3` float(3,1) unsigned NOT NULL DEFAULT '2.0',
-  `fresnel_scale` float(3,2) unsigned NOT NULL DEFAULT '0.40',
-  `fresnel_offset` float(3,2) unsigned NOT NULL DEFAULT '0.50',
-  `refract_scale_above` float(3,2) unsigned NOT NULL DEFAULT '0.03',
-  `refract_scale_below` float(3,2) unsigned NOT NULL DEFAULT '0.20',
-  `blur_multiplier` float(4,3) unsigned NOT NULL DEFAULT '0.040',
-  `big_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.05',
-  `big_wave_direction_y` float(3,2) NOT NULL DEFAULT '-0.42',
-  `little_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.11',
-  `little_wave_direction_y` float(3,2) NOT NULL DEFAULT '-1.16',
-  `normal_map_texture` varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
-  `horizon_r` float(3,2) unsigned NOT NULL DEFAULT '0.25',
-  `horizon_g` float(3,2) unsigned NOT NULL DEFAULT '0.25',
-  `horizon_b` float(3,2) unsigned NOT NULL DEFAULT '0.32',
-  `horizon_i` float(3,2) unsigned NOT NULL DEFAULT '0.32',
-  `haze_horizon` float(3,2) unsigned NOT NULL DEFAULT '0.19',
-  `blue_density_r` float(3,2) unsigned NOT NULL DEFAULT '0.12',
-  `blue_density_g` float(3,2) unsigned NOT NULL DEFAULT '0.22',
-  `blue_density_b` float(3,2) unsigned NOT NULL DEFAULT '0.38',
-  `blue_density_i` float(3,2) unsigned NOT NULL DEFAULT '0.38',
-  `haze_density` float(3,2) unsigned NOT NULL DEFAULT '0.70',
-  `density_multiplier` float(3,2) unsigned NOT NULL DEFAULT '0.18',
-  `distance_multiplier` float(4,1) unsigned NOT NULL DEFAULT '0.8',
-  `max_altitude` int(4) unsigned NOT NULL DEFAULT '1605',
-  `sun_moon_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.24',
-  `sun_moon_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.26',
-  `sun_moon_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.30',
-  `sun_moon_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.30',
-  `sun_moon_position` float(4,3) unsigned NOT NULL DEFAULT '0.317',
-  `ambient_r` float(3,2) unsigned NOT NULL DEFAULT '0.35',
-  `ambient_g` float(3,2) unsigned NOT NULL DEFAULT '0.35',
-  `ambient_b` float(3,2) unsigned NOT NULL DEFAULT '0.35',
-  `ambient_i` float(3,2) unsigned NOT NULL DEFAULT '0.35',
-  `east_angle` float(3,2) unsigned NOT NULL DEFAULT '0.00',
-  `sun_glow_focus` float(3,2) unsigned NOT NULL DEFAULT '0.10',
-  `sun_glow_size` float(3,2) unsigned NOT NULL DEFAULT '1.75',
-  `scene_gamma` float(4,2) unsigned NOT NULL DEFAULT '1.00',
-  `star_brightness` float(3,2) unsigned NOT NULL DEFAULT '0.00',
-  `cloud_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.41',
-  `cloud_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.41',
-  `cloud_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.41',
-  `cloud_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.41',
-  `cloud_x` float(3,2) unsigned NOT NULL DEFAULT '1.00',
-  `cloud_y` float(3,2) unsigned NOT NULL DEFAULT '0.53',
-  `cloud_density` float(3,2) unsigned NOT NULL DEFAULT '1.00',
-  `cloud_coverage` float(3,2) unsigned NOT NULL DEFAULT '0.27',
-  `cloud_scale` float(3,2) unsigned NOT NULL DEFAULT '0.42',
-  `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_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `cloud_scroll_y` float(3,2) unsigned 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`)
-);
-
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/033_RegionStore.sql b/OpenSim/Data/MySQL/Resources/033_RegionStore.sql
deleted file mode 100644
index 2832b41..0000000
--- a/OpenSim/Data/MySQL/Resources/033_RegionStore.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-BEGIN;
-ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
-COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
new file mode 100644
index 0000000..3fd58b7
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -0,0 +1,77 @@
+# -----------------
+:VERSION 1
+
+BEGIN;
+
+CREATE TABLE `assets` (
+  `id` binary(16) NOT NULL,
+  `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,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
+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 CreatorID varchar(36) not null default ''
+
diff --git a/OpenSim/Data/MySQL/Resources/001_AuthStore.sql b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index c7e16fb..023c786 100644
--- a/OpenSim/Data/MySQL/Resources/001_AuthStore.sql
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1         # -------------------------------
+
 begin;
 
 CREATE TABLE `auth` (
@@ -19,3 +21,19 @@ CREATE TABLE `tokens` (
 ) ENGINE=InnoDB;
 
 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';
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/Avatar.migrations b/OpenSim/Data/MySQL/Resources/Avatar.migrations
new file mode 100644
index 0000000..8d0eee6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/Avatar.migrations
@@ -0,0 +1,12 @@
+:VERSION 1
+
+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;
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
new file mode 100644
index 0000000..ce713bd
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -0,0 +1,25 @@
+:VERSION 1       # -------------------------
+
+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`)
+);
+
+COMMIT;
+
+:VERSION 2       # -------------------------
+
+BEGIN;
+
+INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
+
+COMMIT;
+
+
+
diff --git a/OpenSim/Data/MySQL/Resources/001_GridStore.sql b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index cb0f9bd..523a8ac 100644
--- a/OpenSim/Data/MySQL/Resources/001_GridStore.sql
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 CREATE TABLE `regions` (
   `uuid` varchar(36) NOT NULL,
   `regionHandle` bigint(20) unsigned NOT NULL,
@@ -30,3 +32,58 @@ CREATE TABLE `regions` (
   KEY `regionHandle` (`regionHandle`),
   KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3';
+
+: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;
+
+
diff --git a/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index ce4ab96..32b85ee 100644
--- a/OpenSim/Data/MySQL/Resources/001_GridUserStore.sql
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1         # -------------------------- 
+
 BEGIN;
 
 CREATE TABLE `GridUser` (
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
new file mode 100644
index 0000000..8c5864e
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -0,0 +1,93 @@
+:VERSION 1           # ------------
+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=InnoDB 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=InnoDB 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;
diff --git a/OpenSim/Data/MySQL/Resources/001_LogStore.sql b/OpenSim/Data/MySQL/Resources/LogStore.migrations
index b4c29fb..9ac26ac 100644
--- a/OpenSim/Data/MySQL/Resources/001_LogStore.sql
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -1,3 +1,6 @@
+
+:VERSION 1
+
 CREATE TABLE `logs` (
   `logID` int(10) unsigned NOT NULL auto_increment,
   `target` varchar(36) default NULL,
diff --git a/OpenSim/Data/MySQL/Resources/001_Presence.sql b/OpenSim/Data/MySQL/Resources/Presence.migrations
index 84fa057..91f7de5 100644
--- a/OpenSim/Data/MySQL/Resources/001_Presence.sql
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -1,8 +1,10 @@
+:VERSION 1         # -------------------------- 
+
 BEGIN;
 
 CREATE TABLE `Presence` (
     `UserID` VARCHAR(255) NOT NULL,
-    `RegionID` CHAR(36) 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=InnoDB;
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
new file mode 100644
index 0000000..ba898bb
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -0,0 +1,876 @@
+
+: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,
+  `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,
+  `Heightfield` longblob
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `land` (
+  `UUID` varchar(255) NOT 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=InnoDB 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=INNODB 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 = InnoDB;
+alter table migrations ENGINE = InnoDB;
+alter table primitems ENGINE = InnoDB;
+alter table prims ENGINE = InnoDB;
+alter table primshapes ENGINE = InnoDB;
+alter table regionsettings ENGINE = InnoDB;
+alter table terrain ENGINE = InnoDB;
+
+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` (
+  `regionUUID` char(36) NOT NULL,
+  `block_terraform` int(11) NOT NULL,
+  `block_fly` int(11) NOT NULL,
+  `allow_damage` int(11) NOT NULL,
+  `restrict_pushing` int(11) NOT NULL,
+  `allow_land_resell` int(11) NOT NULL,
+  `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,
+  `maturity` int(11) NOT NULL,
+  `disable_scripts` int(11) NOT NULL,
+  `disable_collisions` int(11) NOT NULL,
+  `disable_physics` int(11) 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` int(11) NOT NULL,
+  `fixed_sun` int(11) NOT NULL,
+  `sun_position` float NOT NULL,
+  `covenant` char(36) default NULL,
+  `Sandbox` tinyint(4) NOT NULL,
+  PRIMARY KEY  (`regionUUID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE `estate_managers` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE `estate_groups` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE `estate_users` (
+  `EstateID` int(10) unsigned NOT NULL,
+  `uuid` char(36) NOT NULL,
+  KEY `EstateID` (`EstateID`)
+) ENGINE=InnoDB;
+
+CREATE TABLE `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;
+
+CREATE TABLE `estate_settings` (
+  `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,
+  `FixedSun` tinyint(4) NOT NULL,
+  `DenyTransacted` tinyint(4) NOT NULL,
+  `BlockDwell` tinyint(4) NOT NULL,
+  `DenyIdentified` tinyint(4) NOT NULL,
+  `AllowVoice` tinyint(4) NOT NULL,
+  `UseGlobalTime` tinyint(4) NOT NULL,
+  `PricePerMeter` int(11) NOT NULL,
+  `TaxFree` tinyint(4) NOT NULL,
+  `AllowDirectTeleport` tinyint(4) NOT NULL,
+  `RedirectGridX` int(11) NOT NULL,
+  `RedirectGridY` int(11) NOT NULL,
+  `ParentEstateID` int(10) unsigned NOT NULL,
+  `SunPosition` double NOT NULL,
+  `EstateSkipScripts` tinyint(4) NOT NULL,
+  `BillableFactor` float NOT NULL,
+  `PublicAccess` tinyint(4) NOT NULL,
+  PRIMARY KEY  (`EstateID`)
+) ENGINE=InnoDB AUTO_INCREMENT=100;
+
+CREATE TABLE `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;
+
+commit;
+
+:VERSION 14                     #---------------------
+
+begin;
+
+alter table estate_settings add column AbuseEmail varchar(255) not null;
+
+alter table estate_settings add column EstateOwner varchar(36) not null;
+
+commit;
+
+
+:VERSION 15                     #---------------------
+
+begin;
+
+alter table estate_settings add column DenyMinors tinyint not null;
+
+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` (
+  `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',
+  `water_color_b` float(9,6) unsigned NOT NULL DEFAULT '64.000000',
+  `water_fog_density_exponent` float(3,1) unsigned NOT NULL DEFAULT '4.0',
+  `underwater_fog_modifier` float(3,2) unsigned NOT NULL DEFAULT '0.25',
+  `reflection_wavelet_scale_1` float(3,1) unsigned NOT NULL DEFAULT '2.0',
+  `reflection_wavelet_scale_2` float(3,1) unsigned NOT NULL DEFAULT '2.0',
+  `reflection_wavelet_scale_3` float(3,1) unsigned NOT NULL DEFAULT '2.0',
+  `fresnel_scale` float(3,2) unsigned NOT NULL DEFAULT '0.40',
+  `fresnel_offset` float(3,2) unsigned NOT NULL DEFAULT '0.50',
+  `refract_scale_above` float(3,2) unsigned NOT NULL DEFAULT '0.03',
+  `refract_scale_below` float(3,2) unsigned NOT NULL DEFAULT '0.20',
+  `blur_multiplier` float(4,3) unsigned NOT NULL DEFAULT '0.040',
+  `big_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.05',
+  `big_wave_direction_y` float(3,2) NOT NULL DEFAULT '-0.42',
+  `little_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.11',
+  `little_wave_direction_y` float(3,2) NOT NULL DEFAULT '-1.16',
+  `normal_map_texture` varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
+  `horizon_r` float(3,2) unsigned NOT NULL DEFAULT '0.25',
+  `horizon_g` float(3,2) unsigned NOT NULL DEFAULT '0.25',
+  `horizon_b` float(3,2) unsigned NOT NULL DEFAULT '0.32',
+  `horizon_i` float(3,2) unsigned NOT NULL DEFAULT '0.32',
+  `haze_horizon` float(3,2) unsigned NOT NULL DEFAULT '0.19',
+  `blue_density_r` float(3,2) unsigned NOT NULL DEFAULT '0.12',
+  `blue_density_g` float(3,2) unsigned NOT NULL DEFAULT '0.22',
+  `blue_density_b` float(3,2) unsigned NOT NULL DEFAULT '0.38',
+  `blue_density_i` float(3,2) unsigned NOT NULL DEFAULT '0.38',
+  `haze_density` float(3,2) unsigned NOT NULL DEFAULT '0.70',
+  `density_multiplier` float(3,2) unsigned NOT NULL DEFAULT '0.18',
+  `distance_multiplier` float(4,1) unsigned NOT NULL DEFAULT '0.8',
+  `max_altitude` int(4) unsigned NOT NULL DEFAULT '1605',
+  `sun_moon_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.24',
+  `sun_moon_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.26',
+  `sun_moon_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.30',
+  `sun_moon_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.30',
+  `sun_moon_position` float(4,3) unsigned NOT NULL DEFAULT '0.317',
+  `ambient_r` float(3,2) unsigned NOT NULL DEFAULT '0.35',
+  `ambient_g` float(3,2) unsigned NOT NULL DEFAULT '0.35',
+  `ambient_b` float(3,2) unsigned NOT NULL DEFAULT '0.35',
+  `ambient_i` float(3,2) unsigned NOT NULL DEFAULT '0.35',
+  `east_angle` float(3,2) unsigned NOT NULL DEFAULT '0.00',
+  `sun_glow_focus` float(3,2) unsigned NOT NULL DEFAULT '0.10',
+  `sun_glow_size` float(3,2) unsigned NOT NULL DEFAULT '1.75',
+  `scene_gamma` float(4,2) unsigned NOT NULL DEFAULT '1.00',
+  `star_brightness` float(3,2) unsigned NOT NULL DEFAULT '0.00',
+  `cloud_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.41',
+  `cloud_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.41',
+  `cloud_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.41',
+  `cloud_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.41',
+  `cloud_x` float(3,2) unsigned NOT NULL DEFAULT '1.00',
+  `cloud_y` float(3,2) unsigned NOT NULL DEFAULT '0.53',
+  `cloud_density` float(3,2) unsigned NOT NULL DEFAULT '1.00',
+  `cloud_coverage` float(3,2) unsigned NOT NULL DEFAULT '0.27',
+  `cloud_scale` float(3,2) unsigned NOT NULL DEFAULT '0.42',
+  `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_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `cloud_scroll_y` float(3,2) unsigned 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`)
+);
+
+ALTER TABLE estate_settings AUTO_INCREMENT = 100;
+COMMIT;
+
+:VERSION 33                     #---------------------
+
+BEGIN;
+ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+COMMIT;
+
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
new file mode 100644
index 0000000..84011e6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -0,0 +1,47 @@
+:VERSION 1           # -------------------------
+
+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=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
+
+:VERSION 2              # -------------------------
+
+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;
+
+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/001_UserStore.sql b/OpenSim/Data/MySQL/Resources/UserStore.migrations
index 29ebc7d..f054611 100644
--- a/OpenSim/Data/MySQL/Resources/001_UserStore.sql
+++ b/OpenSim/Data/MySQL/Resources/UserStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1          # -----------------------------
+
 BEGIN;
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -104,4 +106,63 @@ CREATE TABLE `users` (
 -- ----------------------------
 -- Records 
 -- ----------------------------
-COMMIT;
\ No newline at end of file
+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=InnoDB;
+
+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/SQLite/Resources/001_AssetStore.sql b/OpenSim/Data/SQLite/Resources/001_AssetStore.sql
deleted file mode 100644
index 2e026ca..0000000
--- a/OpenSim/Data/SQLite/Resources/001_AssetStore.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/001_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/001_InventoryStore.sql
deleted file mode 100644
index 554d5c2..0000000
--- a/OpenSim/Data/SQLite/Resources/001_InventoryStore.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/001_RegionStore.sql b/OpenSim/Data/SQLite/Resources/001_RegionStore.sql
deleted file mode 100644
index 39e8180..0000000
--- a/OpenSim/Data/SQLite/Resources/001_RegionStore.sql
+++ /dev/null
@@ -1,144 +0,0 @@
-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(
-       UUID varchar(255) primary key,
-       Shape integer,
-       ScaleX float,
-       ScaleY float,
-       ScaleZ float,
-       PCode integer,
-       PathBegin integer,
-       PathEnd integer,
-       PathScaleX integer,
-       PathScaleY integer,
-       PathShearX integer,
-       PathShearY integer,
-       PathSkew integer,
-       PathCurve integer,
-       PathRadiusOffset integer,
-       PathRevolutions integer,
-       PathTaperX integer,
-       PathTaperY integer,
-       PathTwist integer,
-       PathTwistBegin integer,
-       ProfileBegin integer,
-       ProfileEnd integer,
-       ProfileCurve integer,
-       ProfileHollow integer,
-       Texture blob,
-       ExtraParams blob, 
-       State Integer NOT NULL default 0);
-
-CREATE TABLE primitems(
-       itemID varchar(255) primary key,
-       primID varchar(255),
-       assetID varchar(255),
-       parentFolderID varchar(255),
-       invType integer,
-       assetType integer,
-       name varchar(255),
-       description varchar(255),
-       creationDate integer,
-       creatorID varchar(255),
-       ownerID varchar(255),
-       lastOwnerID varchar(255),
-       groupID varchar(255),
-       nextPermissions string,
-       currentPermissions string,
-       basePermissions string,
-       everyonePermissions string,
-       groupPermissions string);
-
-CREATE TABLE terrain(
-       RegionUUID varchar(255),
-       Revision integer,
-       Heightfield blob);
-
-CREATE TABLE land(
-       UUID varchar(255) primary key,
-       RegionUUID varchar(255),
-       LocalLandID string,
-       Bitmap blob,
-       Name varchar(255),
-       Desc varchar(255),
-       OwnerUUID varchar(255),
-       IsGroupOwned string,
-       Area integer,
-       AuctionID integer,
-       Category integer,
-       ClaimDate integer,
-       ClaimPrice integer,
-       GroupUUID varchar(255),
-       SalePrice integer,
-       LandStatus integer,
-       LandFlags string,
-       LandingType string,
-       MediaAutoScale string,
-       MediaTextureUUID varchar(255),
-       MediaURL varchar(255),
-       MusicURL varchar(255),
-       PassHours float,
-       PassPrice string,
-       SnapshotUUID varchar(255),
-       UserLocationX float,
-       UserLocationY float,
-       UserLocationZ float,
-       UserLookAtX float,
-       UserLookAtY float,
-       UserLookAtZ float, 
-       AuthbuyerID varchar(36) NOT NULL default  '00000000-0000-0000-0000-000000000000');
-
-CREATE TABLE landaccesslist(
-       LandUUID varchar(255),
-       AccessUUID varchar(255),
-       Flags string);
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/001_UserStore.sql b/OpenSim/Data/SQLite/Resources/001_UserStore.sql
deleted file mode 100644
index b584594..0000000
--- a/OpenSim/Data/SQLite/Resources/001_UserStore.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/SQLite/Resources/002_AssetStore.sql b/OpenSim/Data/SQLite/Resources/002_AssetStore.sql
deleted file mode 100644
index 5339b84..0000000
--- a/OpenSim/Data/SQLite/Resources/002_AssetStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/002_AuthStore.sql b/OpenSim/Data/SQLite/Resources/002_AuthStore.sql
deleted file mode 100644
index 3237b68..0000000
--- a/OpenSim/Data/SQLite/Resources/002_AuthStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION;
-
-INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey) SELECT `UUID` AS UUID, `passwordHash` AS passwordHash, `passwordSalt` AS passwordSalt, `webLoginKey` AS webLoginKey FROM users;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/002_FriendsStore.sql b/OpenSim/Data/SQLite/Resources/002_FriendsStore.sql
deleted file mode 100644
index 6733502..0000000
--- a/OpenSim/Data/SQLite/Resources/002_FriendsStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION;
-
-INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/002_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/002_InventoryStore.sql
deleted file mode 100644
index 01951d6..0000000
--- a/OpenSim/Data/SQLite/Resources/002_InventoryStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/002_RegionStore.sql b/OpenSim/Data/SQLite/Resources/002_RegionStore.sql
deleted file mode 100644
index c5c7c99..0000000
--- a/OpenSim/Data/SQLite/Resources/002_RegionStore.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-BEGIN TRANSACTION;
-
-CREATE TABLE regionban(
-                regionUUID varchar (255),
-                bannedUUID varchar (255),
-                bannedIp varchar (255),
-                bannedIpHostMask varchar (255)
-                );
-       
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/002_UserAccount.sql b/OpenSim/Data/SQLite/Resources/002_UserAccount.sql
deleted file mode 100644
index c7a6293..0000000
--- a/OpenSim/Data/SQLite/Resources/002_UserAccount.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/002_UserStore.sql b/OpenSim/Data/SQLite/Resources/002_UserStore.sql
deleted file mode 100644
index 48fc680..0000000
--- a/OpenSim/Data/SQLite/Resources/002_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add homeRegionID varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000';
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/003_AssetStore.sql b/OpenSim/Data/SQLite/Resources/003_AssetStore.sql
deleted file mode 100644
index f54f8d9..0000000
--- a/OpenSim/Data/SQLite/Resources/003_AssetStore.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM assets WHERE UUID = 'dc4b9f0bd00845c696a401dd947ac621'
diff --git a/OpenSim/Data/SQLite/Resources/003_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/003_InventoryStore.sql
deleted file mode 100644
index 4c6da91..0000000
--- a/OpenSim/Data/SQLite/Resources/003_InventoryStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-alter table inventoryitems add column inventoryGroupPermissions integer unsigned not null default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/003_RegionStore.sql b/OpenSim/Data/SQLite/Resources/003_RegionStore.sql
deleted file mode 100644
index 4db2f75..0000000
--- a/OpenSim/Data/SQLite/Resources/003_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE primitems add flags integer not null default 0;
-
-COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/003_UserStore.sql b/OpenSim/Data/SQLite/Resources/003_UserStore.sql
deleted file mode 100644
index 6f890ee..0000000
--- a/OpenSim/Data/SQLite/Resources/003_UserStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE users add userFlags integer NOT NULL default 0;
-ALTER TABLE users add godLevel integer NOT NULL default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/004_AssetStore.sql b/OpenSim/Data/SQLite/Resources/004_AssetStore.sql
deleted file mode 100644
index 39421c4..0000000
--- a/OpenSim/Data/SQLite/Resources/004_AssetStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/004_RegionStore.sql b/OpenSim/Data/SQLite/Resources/004_RegionStore.sql
deleted file mode 100644
index de328cb..0000000
--- a/OpenSim/Data/SQLite/Resources/004_RegionStore.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/004_UserStore.sql b/OpenSim/Data/SQLite/Resources/004_UserStore.sql
deleted file mode 100644
index 03142af..0000000
--- a/OpenSim/Data/SQLite/Resources/004_UserStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/005_RegionStore.sql b/OpenSim/Data/SQLite/Resources/005_RegionStore.sql
deleted file mode 100644
index 1f6d1bd..0000000
--- a/OpenSim/Data/SQLite/Resources/005_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-delete from regionsettings;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/005_UserStore.sql b/OpenSim/Data/SQLite/Resources/005_UserStore.sql
deleted file mode 100644
index e45c09a..0000000
--- a/OpenSim/Data/SQLite/Resources/005_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/006_RegionStore.sql b/OpenSim/Data/SQLite/Resources/006_RegionStore.sql
deleted file mode 100644
index 94ed818..0000000
--- a/OpenSim/Data/SQLite/Resources/006_RegionStore.sql
+++ /dev/null
@@ -1,102 +0,0 @@
-BEGIN TRANSACTION;
-
-CREATE TABLE estate_groups (
-  EstateID int(10) NOT NULL,
-  uuid char(36) NOT NULL
-);
-
-CREATE TABLE estate_managers (
-  EstateID int(10) NOT NULL,
-  uuid char(36) NOT NULL
-);
-
-CREATE TABLE estate_map (
-  RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
-  EstateID int(11) NOT NULL
-);
-
-CREATE TABLE estate_settings (
-  EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  EstateName varchar(64) default NULL,
-  AbuseEmailToEstateOwner tinyint(4) NOT NULL,
-  DenyAnonymous tinyint(4) NOT NULL,
-  ResetHomeOnTeleport tinyint(4) NOT NULL,
-  FixedSun tinyint(4) NOT NULL,
-  DenyTransacted tinyint(4) NOT NULL,
-  BlockDwell tinyint(4) NOT NULL,
-  DenyIdentified tinyint(4) NOT NULL,
-  AllowVoice tinyint(4) NOT NULL,
-  UseGlobalTime tinyint(4) NOT NULL,
-  PricePerMeter int(11) NOT NULL,
-  TaxFree tinyint(4) NOT NULL,
-  AllowDirectTeleport tinyint(4) NOT NULL,
-  RedirectGridX int(11) NOT NULL,
-  RedirectGridY int(11) NOT NULL,
-  ParentEstateID int(10) NOT NULL,
-  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 (
-  EstateID int(10) NOT NULL,
-  uuid char(36) NOT NULL
-);
-
-CREATE TABLE 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
-);
-
-drop table regionsettings;
-CREATE TABLE regionsettings (
-  regionUUID char(36) NOT NULL,
-  block_terraform int(11) NOT NULL,
-  block_fly int(11) NOT NULL,
-  allow_damage int(11) NOT NULL,
-  restrict_pushing int(11) NOT NULL,
-  allow_land_resell int(11) NOT NULL,
-  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,
-  maturity int(11) NOT NULL,
-  disable_scripts int(11) NOT NULL,
-  disable_collisions int(11) NOT NULL,
-  disable_physics int(11) 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 int(11) NOT NULL,
-  fixed_sun int(11) NOT NULL,
-  sun_position float NOT NULL,
-  covenant char(36) default NULL,
-  Sandbox tinyint(4) NOT NULL,
-  PRIMARY KEY  (regionUUID)
-);
-
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/006_UserStore.sql b/OpenSim/Data/SQLite/Resources/006_UserStore.sql
deleted file mode 100644
index f9454c5..0000000
--- a/OpenSim/Data/SQLite/Resources/006_UserStore.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/007_RegionStore.sql b/OpenSim/Data/SQLite/Resources/007_RegionStore.sql
deleted file mode 100644
index 1c813a0..0000000
--- a/OpenSim/Data/SQLite/Resources/007_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/SQLite/Resources/007_UserStore.sql b/OpenSim/Data/SQLite/Resources/007_UserStore.sql
deleted file mode 100644
index 8b0cd28..0000000
--- a/OpenSim/Data/SQLite/Resources/007_UserStore.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/008_RegionStore.sql b/OpenSim/Data/SQLite/Resources/008_RegionStore.sql
deleted file mode 100644
index 28bfbf5..0000000
--- a/OpenSim/Data/SQLite/Resources/008_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-begin;
-
-alter table estate_settings add column DenyMinors tinyint not null default 0;
-
-commit;
-
diff --git a/OpenSim/Data/SQLite/Resources/008_UserStore.sql b/OpenSim/Data/SQLite/Resources/008_UserStore.sql
deleted file mode 100644
index 97da818..0000000
--- a/OpenSim/Data/SQLite/Resources/008_UserStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN TRANSACTION;
-
-ALTER TABLE users add email varchar(250);
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/009_RegionStore.sql b/OpenSim/Data/SQLite/Resources/009_RegionStore.sql
deleted file mode 100644
index 1f40548..0000000
--- a/OpenSim/Data/SQLite/Resources/009_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/009_UserStore.sql b/OpenSim/Data/SQLite/Resources/009_UserStore.sql
deleted file mode 100644
index 8ab03ef..0000000
--- a/OpenSim/Data/SQLite/Resources/009_UserStore.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/010_RegionStore.sql b/OpenSim/Data/SQLite/Resources/010_RegionStore.sql
deleted file mode 100644
index b91ccf0..0000000
--- a/OpenSim/Data/SQLite/Resources/010_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN ClickAction INTEGER NOT NULL default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/010_UserStore.sql b/OpenSim/Data/SQLite/Resources/010_UserStore.sql
deleted file mode 100644
index 5f956da..0000000
--- a/OpenSim/Data/SQLite/Resources/010_UserStore.sql
+++ /dev/null
@@ -1,37 +0,0 @@
-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/Resources/011_RegionStore.sql b/OpenSim/Data/SQLite/Resources/011_RegionStore.sql
deleted file mode 100644
index 42bef89..0000000
--- a/OpenSim/Data/SQLite/Resources/011_RegionStore.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/012_RegionStore.sql b/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
deleted file mode 100644
index d952b78..0000000
--- a/OpenSim/Data/SQLite/Resources/012_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN Material INTEGER NOT NULL default 3;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/013_RegionStore.sql b/OpenSim/Data/SQLite/Resources/013_RegionStore.sql
deleted file mode 100644
index 11529cd..0000000
--- a/OpenSim/Data/SQLite/Resources/013_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE land ADD COLUMN OtherCleanTime INTEGER NOT NULL default 0;
-ALTER TABLE land ADD COLUMN Dwell INTEGER NOT NULL default 0;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/014_RegionStore.sql b/OpenSim/Data/SQLite/Resources/014_RegionStore.sql
deleted file mode 100644
index c59b27e..0000000
--- a/OpenSim/Data/SQLite/Resources/014_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
-
diff --git a/OpenSim/Data/SQLite/Resources/015_RegionStore.sql b/OpenSim/Data/SQLite/Resources/015_RegionStore.sql
deleted file mode 100644
index c43f356..0000000
--- a/OpenSim/Data/SQLite/Resources/015_RegionStore.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-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;
diff --git a/OpenSim/Data/SQLite/Resources/016_RegionStore.sql b/OpenSim/Data/SQLite/Resources/016_RegionStore.sql
deleted file mode 100644
index 52f160c..0000000
--- a/OpenSim/Data/SQLite/Resources/016_RegionStore.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE prims ADD COLUMN VolumeDetect INTEGER NOT NULL DEFAULT 0;
-
-COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/017_RegionStore.sql b/OpenSim/Data/SQLite/Resources/017_RegionStore.sql
deleted file mode 100644
index 6c6b7b5..0000000
--- a/OpenSim/Data/SQLite/Resources/017_RegionStore.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/018_RegionStore.sql b/OpenSim/Data/SQLite/Resources/018_RegionStore.sql
deleted file mode 100644
index 6a390c2..0000000
--- a/OpenSim/Data/SQLite/Resources/018_RegionStore.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-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;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/AssetStore.migrations b/OpenSim/Data/SQLite/Resources/AssetStore.migrations
new file mode 100644
index 0000000..bc11e13
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/AssetStore.migrations
@@ -0,0 +1,66 @@
+:VERSION 1
+
+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(36) 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;
+
+COMMIT;
+
diff --git a/OpenSim/Data/SQLite/Resources/001_AuthStore.sql b/OpenSim/Data/SQLite/Resources/AuthStore.migrations
index 468567d..ca6bdf5 100644
--- a/OpenSim/Data/SQLite/Resources/001_AuthStore.sql
+++ b/OpenSim/Data/SQLite/Resources/AuthStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION;
 
 CREATE TABLE auth (
@@ -16,3 +18,12 @@ CREATE TABLE tokens (
 );
 
 COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey) SELECT `UUID` AS UUID, `passwordHash` AS passwordHash, `passwordSalt` AS passwordSalt, `webLoginKey` AS webLoginKey FROM users;
+
+COMMIT;
+
diff --git a/OpenSim/Data/SQLite/Resources/001_Avatar.sql b/OpenSim/Data/SQLite/Resources/Avatar.migrations
index 7ec906b..13b4196 100644
--- a/OpenSim/Data/SQLite/Resources/001_Avatar.sql
+++ b/OpenSim/Data/SQLite/Resources/Avatar.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION;
 
 CREATE TABLE Avatars (
diff --git a/OpenSim/Data/SQLite/Resources/001_FriendsStore.sql b/OpenSim/Data/SQLite/Resources/FriendsStore.migrations
index f1b9ab9..3eb4352 100644
--- a/OpenSim/Data/SQLite/Resources/001_FriendsStore.sql
+++ b/OpenSim/Data/SQLite/Resources/FriendsStore.migrations
@@ -1,3 +1,5 @@
+:VERSION 1
+
 BEGIN TRANSACTION;
 
 CREATE TABLE `Friends` (
@@ -8,3 +10,11 @@ CREATE TABLE `Friends` (
         PRIMARY KEY(`PrincipalID`, `Friend`));
 
 COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql b/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
index e8f4d46..585ac49 100644
--- a/OpenSim/Data/SQLite/Resources/004_InventoryStore.sql
+++ b/OpenSim/Data/SQLite/Resources/InventoryStore.migrations
@@ -1,3 +1,59 @@
+: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 
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
new file mode 100644
index 0000000..7b27378
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -0,0 +1,526 @@
+:VERSION 1
+
+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(
+       UUID varchar(255) primary key,
+       Shape integer,
+       ScaleX float,
+       ScaleY float,
+       ScaleZ float,
+       PCode integer,
+       PathBegin integer,
+       PathEnd integer,
+       PathScaleX integer,
+       PathScaleY integer,
+       PathShearX integer,
+       PathShearY integer,
+       PathSkew integer,
+       PathCurve integer,
+       PathRadiusOffset integer,
+       PathRevolutions integer,
+       PathTaperX integer,
+       PathTaperY integer,
+       PathTwist integer,
+       PathTwistBegin integer,
+       ProfileBegin integer,
+       ProfileEnd integer,
+       ProfileCurve integer,
+       ProfileHollow integer,
+       Texture blob,
+       ExtraParams blob, 
+       State Integer NOT NULL default 0);
+
+CREATE TABLE primitems(
+       itemID varchar(255) primary key,
+       primID varchar(255),
+       assetID varchar(255),
+       parentFolderID varchar(255),
+       invType integer,
+       assetType integer,
+       name varchar(255),
+       description varchar(255),
+       creationDate integer,
+       creatorID varchar(255),
+       ownerID varchar(255),
+       lastOwnerID varchar(255),
+       groupID varchar(255),
+       nextPermissions string,
+       currentPermissions string,
+       basePermissions string,
+       everyonePermissions string,
+       groupPermissions string);
+
+CREATE TABLE terrain(
+       RegionUUID varchar(255),
+       Revision integer,
+       Heightfield blob);
+
+CREATE TABLE land(
+       UUID varchar(255) primary key,
+       RegionUUID varchar(255),
+       LocalLandID string,
+       Bitmap blob,
+       Name varchar(255),
+       Desc varchar(255),
+       OwnerUUID varchar(255),
+       IsGroupOwned string,
+       Area integer,
+       AuctionID integer,
+       Category integer,
+       ClaimDate integer,
+       ClaimPrice integer,
+       GroupUUID varchar(255),
+       SalePrice integer,
+       LandStatus integer,
+       LandFlags string,
+       LandingType string,
+       MediaAutoScale string,
+       MediaTextureUUID varchar(255),
+       MediaURL varchar(255),
+       MusicURL varchar(255),
+       PassHours float,
+       PassPrice string,
+       SnapshotUUID varchar(255),
+       UserLocationX float,
+       UserLocationY float,
+       UserLocationZ float,
+       UserLookAtX float,
+       UserLookAtY float,
+       UserLookAtZ float, 
+       AuthbuyerID varchar(36) NOT NULL default  '00000000-0000-0000-0000-000000000000');
+
+CREATE TABLE 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
+
+BEGIN TRANSACTION;
+
+CREATE TABLE estate_groups (
+  EstateID int(10) NOT NULL,
+  uuid char(36) NOT NULL
+);
+
+CREATE TABLE estate_managers (
+  EstateID int(10) NOT NULL,
+  uuid char(36) NOT NULL
+);
+
+CREATE TABLE estate_map (
+  RegionID char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  EstateID int(11) NOT NULL
+);
+
+CREATE TABLE estate_settings (
+  EstateID INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  EstateName varchar(64) default NULL,
+  AbuseEmailToEstateOwner tinyint(4) NOT NULL,
+  DenyAnonymous tinyint(4) NOT NULL,
+  ResetHomeOnTeleport tinyint(4) NOT NULL,
+  FixedSun tinyint(4) NOT NULL,
+  DenyTransacted tinyint(4) NOT NULL,
+  BlockDwell tinyint(4) NOT NULL,
+  DenyIdentified tinyint(4) NOT NULL,
+  AllowVoice tinyint(4) NOT NULL,
+  UseGlobalTime tinyint(4) NOT NULL,
+  PricePerMeter int(11) NOT NULL,
+  TaxFree tinyint(4) NOT NULL,
+  AllowDirectTeleport tinyint(4) NOT NULL,
+  RedirectGridX int(11) NOT NULL,
+  RedirectGridY int(11) NOT NULL,
+  ParentEstateID int(10) NOT NULL,
+  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 (
+  EstateID int(10) NOT NULL,
+  uuid char(36) NOT NULL
+);
+
+CREATE TABLE 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
+);
+
+drop table regionsettings;
+CREATE TABLE regionsettings (
+  regionUUID char(36) NOT NULL,
+  block_terraform int(11) NOT NULL,
+  block_fly int(11) NOT NULL,
+  allow_damage int(11) NOT NULL,
+  restrict_pushing int(11) NOT NULL,
+  allow_land_resell int(11) NOT NULL,
+  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,
+  maturity int(11) NOT NULL,
+  disable_scripts int(11) NOT NULL,
+  disable_collisions int(11) NOT NULL,
+  disable_physics int(11) 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 int(11) NOT NULL,
+  fixed_sun int(11) NOT NULL,
+  sun_position float NOT NULL,
+  covenant char(36) default NULL,
+  Sandbox tinyint(4) NOT NULL,
+  PRIMARY KEY  (regionUUID)
+);
+
+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 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;
diff --git a/OpenSim/Data/SQLite/Resources/001_UserAccount.sql b/OpenSim/Data/SQLite/Resources/UserAccount.migrations
index c38d9a7..854fe69 100644
--- a/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
+++ b/OpenSim/Data/SQLite/Resources/UserAccount.migrations
@@ -1,4 +1,6 @@
-BEGIN TRANSACTION;
+:VERSION 1
+
+BEGIN TRANSACTION;
 
 -- useraccounts table
 CREATE TABLE UserAccounts (
@@ -14,4 +16,12 @@ CREATE TABLE UserAccounts (
     UserTitle varchar(64) NOT NULL DEFAULT ''
 );
 
-COMMIT;
\ No newline at end of file
+COMMIT;
+
+:VERSION 2
+
+BEGIN TRANSACTION;
+
+INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT `UUID` AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, username AS FirstName, surname AS LastName, '' as Email, '' AS ServiceURLs, created as Created FROM users;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/UserStore.migrations b/OpenSim/Data/SQLite/Resources/UserStore.migrations
new file mode 100644
index 0000000..73d35e8
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/UserStore.migrations
@@ -0,0 +1,169 @@
+: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 7081f99..16e560c 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -44,10 +44,10 @@ namespace OpenSim.Data.SQLite
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const string SelectAssetSQL = "select * from assets where UUID=:UUID";
-        private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, asset_flags, UUID from assets limit :start, :count";
+        private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, asset_flags, UUID, CreatorID from assets limit :start, :count";
         private const string DeleteAssetSQL = "delete from assets where UUID=:UUID";
-        private const string InsertAssetSQL = "insert into assets(UUID, Name, Description, Type, Local, Temporary, asset_flags, Data) values(:UUID, :Name, :Description, :Type, :Local, :Temporary, :Flags, :Data)";
-        private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, asset_flags=:Flags, Data=:Data where UUID=:UUID";
+        private const string InsertAssetSQL = "insert into assets(UUID, Name, Description, Type, Local, Temporary, asset_flags, CreatorID, Data) values(:UUID, :Name, :Description, :Type, :Local, :Temporary, :Flags, :CreatorID, :Data)";
+        private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, asset_flags=:Flags, CreatorID=:CreatorID, Data=:Data where UUID=:UUID";
         private const string assetSelect = "select * from assets";
 
         private SqliteConnection m_conn;
@@ -137,6 +137,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
                         cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
                         cmd.Parameters.Add(new SqliteParameter(":Flags", asset.Flags));
+                        cmd.Parameters.Add(new SqliteParameter(":CreatorID", asset.Metadata.CreatorID));
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
@@ -156,6 +157,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
                         cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
                         cmd.Parameters.Add(new SqliteParameter(":Flags", asset.Flags));
+                        cmd.Parameters.Add(new SqliteParameter(":CreatorID", asset.Metadata.CreatorID));
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
@@ -223,7 +225,7 @@ namespace OpenSim.Data.SQLite
                 new UUID((String)row["UUID"]),
                 (String)row["Name"],
                 Convert.ToSByte(row["Type"]),
-                UUID.Zero.ToString()
+                (String)row["CreatorID"]
             );
 
             asset.Description = (String) row["Description"];
@@ -244,6 +246,7 @@ namespace OpenSim.Data.SQLite
             metadata.Type = Convert.ToSByte(row["Type"]);
             metadata.Temporary = Convert.ToBoolean(row["Temporary"]); // Not sure if this is correct.
             metadata.Flags = (AssetFlags)Convert.ToInt32(row["asset_flags"]);
+            metadata.CreatorID = row["CreatorID"].ToString();
 
             // Current SHA1s are not stored/computed.
             metadata.SHA1 = new byte[] {};
@@ -328,6 +331,25 @@ namespace OpenSim.Data.SQLite
             get { return "SQLite Asset storage engine"; }
         }
 
+        // TODO: (AlexRa): one of these is to be removed eventually (?)
+
+        /// <summary>
+        /// Delete an asset from database
+        /// </summary>
+        /// <param name="uuid"></param>
+        public bool DeleteAsset(UUID uuid)
+        {
+            lock (this)
+            {
+            using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
+            {
+                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
+                cmd.ExecuteNonQuery();
+            }
+            }
+            return true;
+        }
+
         public override bool Delete(string id)
         {
             UUID assetID;
@@ -335,17 +357,7 @@ namespace OpenSim.Data.SQLite
             if (!UUID.TryParse(id, out assetID))
                 return false;
 
-            lock (this)
-            {
-                using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", assetID.ToString()));
-
-                    cmd.ExecuteNonQuery();
-                }
-            }
-
-            return true;
+            return DeleteAsset(assetID);
         }
 
         #endregion
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index e80cff9..71d6314 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -42,7 +42,11 @@ namespace OpenSim.Data.Tests
         public UUID uuid1;
         public UUID uuid2;
         public UUID uuid3;
+        public string critter1 = UUID.Random().ToString();
+        public string critter2 = UUID.Random().ToString();
+        public string critter3 = UUID.Random().ToString();
         public byte[] asset1;
+        PropertyScrambler<AssetBase> scrambler;
 
         public void SuperInit()
         {
@@ -53,6 +57,16 @@ namespace OpenSim.Data.Tests
             uuid3 = UUID.Random();
             asset1 = new byte[100];
             asset1.Initialize();
+            
+
+            scrambler = new PropertyScrambler<AssetBase>()
+                .DontScramble(x => x.ID)
+                .DontScramble(x => x.FullID)
+                .DontScramble(x => x.Metadata.ID)
+                .DontScramble(x => x.Metadata.Type)
+                .DontScramble(x => x.Metadata.CreatorID)
+                .DontScramble(x => x.Metadata.ContentType)
+                .DontScramble(x => x.Metadata.FullID);
         }
 
         [Test]
@@ -66,27 +80,17 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_StoreSimpleAsset()
         {
-            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
-            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, UUID.Zero.ToString());
-            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, UUID.Zero.ToString());
+            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1);
+            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2);
+            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3);
             a1.Data = asset1;
             a2.Data = asset1;
             a3.Data = asset1;
 
-            PropertyScrambler<AssetBase> scrambler = new PropertyScrambler<AssetBase>()
-                .DontScramble(x => x.Data)
-                .DontScramble(x => x.ID)
-                .DontScramble(x => x.FullID)
-                .DontScramble(x => x.Metadata.ID)
-                .DontScramble(x => x.Metadata.CreatorID)
-                .DontScramble(x => x.Metadata.ContentType)
-                .DontScramble(x => x.Metadata.FullID);
-
             scrambler.Scramble(a1);
             scrambler.Scramble(a2);
             scrambler.Scramble(a3);
 
-
             db.StoreAsset(a1);
             db.StoreAsset(a2);
             db.StoreAsset(a3);
@@ -130,5 +134,33 @@ namespace OpenSim.Data.Tests
             Assert.That(metadata.Temporary, Is.EqualTo(a1b.Temporary));
             Assert.That(metadata.FullID, Is.EqualTo(a1b.FullID));
         }
+
+
+        [Test]
+        public void T020_CheckForWeirdCreatorID()
+        {
+            // 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.
+            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1);
+            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, "This is not a GUID!");
+            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, "");
+            a1.Data = asset1;
+            a2.Data = asset1;
+            a3.Data = asset1;
+
+            db.StoreAsset(a1);
+            db.StoreAsset(a2);
+            db.StoreAsset(a3);
+
+            AssetBase a1a = db.GetAsset(uuid1);
+            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
+
+            AssetBase a2a = db.GetAsset(uuid2);
+            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
+
+            AssetBase a3a = db.GetAsset(uuid3);
+            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
+        }
     }
 }
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index cd95506..72a251e 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -66,7 +66,10 @@ namespace OpenSim.Framework.Console
                 }
                 else
                 {
-                    System.Console.Write(loggingMessage);
+                    if (!loggingMessage.EndsWith("\n"))
+                        System.Console.WriteLine(loggingMessage);
+                    else
+                        System.Console.Write(loggingMessage);
                 }
             }
             catch (Exception e)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ae2a80c..562d69e 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -571,207 +571,6 @@ namespace OpenSim.Framework
         public float dwell;
     }
 
-    public struct SendAvatarData
-    {
-        public readonly ulong RegionHandle;
-        public readonly string FirstName;
-        public readonly string LastName;
-        public readonly string GroupTitle;
-        public readonly UUID AvatarID;
-        public readonly uint AvatarLocalID;
-        public readonly Vector3 Position;
-        public readonly byte[] TextureEntry;
-        public readonly uint ParentID;
-        public readonly Quaternion Rotation;
-
-        public SendAvatarData(ulong regionHandle, string firstName, string lastName, string groupTitle, UUID avatarID,
-            uint avatarLocalID, Vector3 position, byte[] textureEntry, uint parentID, Quaternion rotation)
-        {
-            RegionHandle = regionHandle;
-            FirstName = firstName;
-            LastName = lastName;
-            GroupTitle = groupTitle;
-            AvatarID = avatarID;
-            AvatarLocalID = avatarLocalID;
-            Position = position;
-            TextureEntry = textureEntry;
-            ParentID = parentID;
-            Rotation = rotation;
-        }
-    }
-
-    public struct SendAvatarTerseData
-    {
-        public readonly ulong RegionHandle;
-        public readonly ushort TimeDilation;
-        public readonly uint LocalID;
-        public readonly Vector3 Position;
-        public readonly Vector3 Velocity;
-        public readonly Vector3 Acceleration;
-        public readonly Quaternion Rotation;
-        public readonly Vector4 CollisionPlane;
-        public readonly UUID AgentID;
-        public readonly byte[] TextureEntry;
-        public readonly double Priority;
-
-        public SendAvatarTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity,
-            Vector3 acceleration, Quaternion rotation, Vector4 collisionPlane, UUID agentid, byte[] textureEntry, double priority)
-        {
-            RegionHandle = regionHandle;
-            TimeDilation = timeDilation;
-            LocalID = localID;
-            Position = position;
-            Velocity = velocity;
-            Acceleration = acceleration;
-            Rotation = rotation;
-            CollisionPlane = collisionPlane;
-            AgentID = agentid;
-            TextureEntry = textureEntry;
-            Priority = priority;
-        }
-    }
-
-    public struct SendPrimitiveTerseData
-    {
-        public readonly ulong RegionHandle;
-        public readonly ushort TimeDilation;
-        public readonly uint LocalID;
-        public readonly Vector3 Position;
-        public readonly Quaternion Rotation;
-        public readonly Vector3 Velocity;
-        public readonly Vector3 Acceleration;
-        public readonly Vector3 AngularVelocity;
-        public readonly UUID AssetID;
-        public readonly UUID OwnerID;
-        public readonly int AttachPoint;
-        public readonly byte[] TextureEntry;
-        public readonly double Priority;
-
-        public SendPrimitiveTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
-            Quaternion rotation, Vector3 velocity, Vector3 acceleration, Vector3 rotationalvelocity,
-            UUID assetID, UUID ownerID, int attachPoint, byte[] textureEntry, double priority)
-        {
-            RegionHandle = regionHandle;
-            TimeDilation = timeDilation;
-            LocalID = localID;
-            Position = position;
-            Rotation = rotation;
-            Velocity = velocity;
-            Acceleration = acceleration;
-            AngularVelocity = rotationalvelocity;
-            AssetID = assetID;
-            OwnerID = ownerID;
-            AttachPoint = attachPoint;
-            TextureEntry = textureEntry;
-            Priority = priority;
-        }
-    }
-
-    public struct SendPrimitiveData
-    {
-        private ulong m_regionHandle;
-        private ushort m_timeDilation;
-        private uint m_localID;
-        private PrimitiveBaseShape m_primShape;
-        private Vector3 m_pos;
-        private Vector3 m_vel;
-        private Vector3 m_acc;
-        private Quaternion m_rotation;
-        private Vector3 m_rvel;
-        private PrimFlags m_flags;
-        private UUID m_objectID;
-        private UUID m_ownerID;
-        private string m_text;
-        private byte[] m_color;
-        private uint m_parentID;
-        private byte[] m_particleSystem;
-        private byte m_clickAction;
-        private byte m_material;
-        private byte[] m_textureanim;
-        private bool m_attachment;
-        private uint m_AttachPoint;
-        private UUID m_AssetId;
-        private UUID m_SoundId;
-        private double m_SoundVolume;
-        private byte m_SoundFlags;
-        private double m_SoundRadius;
-        private double m_priority;
-
-        public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
-                                   uint flags, UUID objectID, UUID ownerID, string text, byte[] color,
-                                   uint parentID, byte[] particleSystem, byte clickAction, byte material, double priority) :
-            this(regionHandle, timeDilation, localID, primShape, pos, vel, acc, rotation, rvel, flags, objectID,
-            ownerID, text, color, parentID, particleSystem, clickAction, material, new byte[0], false, 0, UUID.Zero,
-            UUID.Zero, 0, 0, 0, priority) { }
-
-        public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
-                                   Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel,
-                                   uint flags,
-                                   UUID objectID, UUID ownerID, string text, byte[] color, uint parentID,
-                                   byte[] particleSystem,
-                                   byte clickAction, byte material, byte[] textureanim, bool attachment,
-                                   uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags,
-                                   double SoundRadius, double priority)
-        {
-            this.m_regionHandle = regionHandle;
-            this.m_timeDilation = timeDilation;
-            this.m_localID = localID;
-            this.m_primShape = primShape;
-            this.m_pos = pos;
-            this.m_vel = vel;
-            this.m_acc = acc;
-            this.m_rotation = rotation;
-            this.m_rvel = rvel;
-            this.m_flags = (PrimFlags)flags;
-            this.m_objectID = objectID;
-            this.m_ownerID = ownerID;
-            this.m_text = text;
-            this.m_color = color;
-            this.m_parentID = parentID;
-            this.m_particleSystem = particleSystem;
-            this.m_clickAction = clickAction;
-            this.m_material = material;
-            this.m_textureanim = textureanim;
-            this.m_attachment = attachment;
-            this.m_AttachPoint = AttachPoint;
-            this.m_AssetId = AssetId;
-            this.m_SoundId = SoundId;
-            this.m_SoundVolume = SoundVolume;
-            this.m_SoundFlags = SoundFlags;
-            this.m_SoundRadius = SoundRadius;
-            this.m_priority = priority;
-        }
-
-        public ulong regionHandle { get { return this.m_regionHandle; } }
-        public ushort timeDilation { get { return this.m_timeDilation; } }
-        public uint localID { get { return this.m_localID; } }
-        public PrimitiveBaseShape primShape { get { return this.m_primShape; } }
-        public Vector3 pos { get { return this.m_pos; } }
-        public Vector3 vel { get { return this.m_vel; } }
-        public Vector3 acc { get { return this.m_acc; } }
-        public Quaternion rotation { get { return this.m_rotation; } }
-        public Vector3 rvel { get { return this.m_rvel; } }
-        public PrimFlags flags { get { return this.m_flags; } }
-        public UUID objectID { get { return this.m_objectID; } }
-        public UUID ownerID { get { return this.m_ownerID; } }
-        public string text { get { return this.m_text; } }
-        public byte[] color { get { return this.m_color; } }
-        public uint parentID { get { return this.m_parentID; } }
-        public byte[] particleSystem { get { return this.m_particleSystem; } }
-        public byte clickAction { get { return this.m_clickAction; } }
-        public byte material { get { return this.m_material; } }
-        public byte[] textureanim { get { return this.m_textureanim; } }
-        public bool attachment { get { return this.m_attachment; } }
-        public uint AttachPoint { get { return this.m_AttachPoint; } }
-        public UUID AssetId { get { return this.m_AssetId; } }
-        public UUID SoundId { get { return this.m_SoundId; } }
-        public double SoundVolume { get { return this.m_SoundVolume; } }
-        public byte SoundFlags { get { return this.m_SoundFlags; } }
-        public double SoundRadius { get { return this.m_SoundRadius; } }
-        public double priority { get { return this.m_priority; } }
-    }
-
     public struct UpdatePriorityData {
         private double m_priority;
         private uint m_localID;
@@ -785,14 +584,46 @@ namespace OpenSim.Framework
         public uint localID { get { return this.m_localID; } }
     }
 
+    /// <summary>
+    /// Specifies the fields that have been changed when sending a prim or
+    /// avatar update
+    /// </summary>
     [Flags]
-    public enum StateUpdateTypes
+    public enum PrimUpdateFlags : uint
     {
         None = 0,
-        AvatarTerse = 1,
-        PrimitiveTerse = AvatarTerse << 1,
-        PrimitiveFull = PrimitiveTerse << 1,
-        All = AvatarTerse | PrimitiveTerse | PrimitiveFull,
+        AttachmentPoint = 1 << 0,
+        Material = 1 << 1,
+        ClickAction = 1 << 2,
+        Scale = 1 << 3,
+        ParentID = 1 << 4,
+        PrimFlags = 1 << 5,
+        PrimData = 1 << 6,
+        MediaURL = 1 << 7,
+        ScratchPad = 1 << 8,
+        Textures = 1 << 9,
+        TextureAnim = 1 << 10,
+        NameValue = 1 << 11,
+        Position = 1 << 12,
+        Rotation = 1 << 13,
+        Velocity = 1 << 14,
+        Acceleration = 1 << 15,
+        AngularVelocity = 1 << 16,
+        CollisionPlane = 1 << 17,
+        Text = 1 << 18,
+        Particles = 1 << 19,
+        ExtraData = 1 << 20,
+        Sound = 1 << 21,
+        Joint = 1 << 22,
+        FullUpdate = UInt32.MaxValue
+    }
+
+    public static class PrimUpdateFlagsExtensions
+    {
+        public static bool HasFlag(this PrimUpdateFlags updateFlags, PrimUpdateFlags flag)
+        {
+            return (updateFlags & flag) == flag;
+        }
     }
 
     public interface IClientAPI
@@ -1188,27 +1019,20 @@ namespace OpenSim.Framework
         void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance);
         void SendPayPrice(UUID objectID, int[] payPrice);
 
-        void SendAvatarData(SendAvatarData data);
-
-        void SendAvatarTerseUpdate(SendAvatarTerseData data);
-
         void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
 
         void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID);
         void SetChildAgentThrottle(byte[] throttle);
 
-        void SendPrimitiveToClient(SendPrimitiveData data);
-
-        void SendPrimTerseUpdate(SendPrimitiveTerseData data);
-
-        void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler);
+        void SendAvatarDataImmediate(ISceneEntity avatar);
+        void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags);
+        void ReprioritizeUpdates(UpdatePriorityHandler handler);
+        void FlushPrimUpdates();
 
         void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
                                         List<InventoryFolderBase> folders, int version, bool fetchFolders,
                                         bool fetchItems);
 
-        void FlushPrimUpdates();
-
         void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item);
 
         /// <summary>
diff --git a/OpenSim/Framework/ISceneEntity.cs b/OpenSim/Framework/ISceneEntity.cs
new file mode 100644
index 0000000..fa3c514
--- /dev/null
+++ b/OpenSim/Framework/ISceneEntity.cs
@@ -0,0 +1,37 @@
+/*
+ * 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 OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+    public interface ISceneEntity
+    {
+        UUID UUID { get; }
+        uint LocalId { get; }
+    }
+}
diff --git a/OpenSim/Framework/Lazy.cs b/OpenSim/Framework/Lazy.cs
new file mode 100644
index 0000000..8a417ac
--- /dev/null
+++ b/OpenSim/Framework/Lazy.cs
@@ -0,0 +1,236 @@
+//
+// Lazy.cs
+//
+// Authors:
+//  Zoltan Varga (vargaz@gmail.com)
+//  Marek Safar (marek.safar@gmail.com)
+//
+// Copyright (C) 2009 Novell
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using System.Threading;
+using System.Diagnostics;
+
+namespace OpenSim.Framework
+{
+    public enum LazyThreadSafetyMode
+    {
+        None,
+        PublicationOnly,
+        ExecutionAndPublication
+    }
+
+    [SerializableAttribute]
+    [ComVisibleAttribute(false)]
+    [HostProtectionAttribute(SecurityAction.LinkDemand, Synchronization = true, ExternalThreading = true)]
+    public class Lazy<T>
+    {
+        T value;
+        bool inited;
+        LazyThreadSafetyMode mode;
+        Func<T> factory;
+        object monitor;
+        Exception exception;
+
+        public Lazy()
+            : this(LazyThreadSafetyMode.ExecutionAndPublication)
+        {
+        }
+
+        public Lazy(Func<T> valueFactory)
+            : this(valueFactory, LazyThreadSafetyMode.ExecutionAndPublication)
+        {
+        }
+
+        public Lazy(bool isThreadSafe)
+            : this(() => Activator.CreateInstance<T>(), isThreadSafe ? LazyThreadSafetyMode.ExecutionAndPublication : LazyThreadSafetyMode.None)
+        {
+        }
+
+        public Lazy(Func<T> valueFactory, bool isThreadSafe)
+            : this(valueFactory, isThreadSafe ? LazyThreadSafetyMode.ExecutionAndPublication : LazyThreadSafetyMode.None)
+        {
+        }
+
+        public Lazy(LazyThreadSafetyMode mode)
+            : this(() => Activator.CreateInstance<T>(), mode)
+        {
+        }
+
+        public Lazy(Func<T> valueFactory, LazyThreadSafetyMode mode)
+        {
+            if (valueFactory == null)
+                throw new ArgumentNullException("valueFactory");
+            this.factory = valueFactory;
+            if (mode != LazyThreadSafetyMode.None)
+                monitor = new object();
+            this.mode = mode;
+        }
+
+        // Don't trigger expensive initialization
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+        public T Value
+        {
+            get
+            {
+                if (inited)
+                    return value;
+                if (exception != null)
+                    throw exception;
+
+                return InitValue();
+            }
+        }
+
+        T InitValue()
+        {
+            switch (mode)
+            {
+                case LazyThreadSafetyMode.None:
+                    {
+                        var init_factory = factory;
+                        if (init_factory == null)
+                            throw exception = new InvalidOperationException("The initialization function tries to access Value on this instance");
+                        try
+                        {
+                            factory = null;
+                            T v = init_factory();
+                            value = v;
+                            Thread.MemoryBarrier();
+                            inited = true;
+                        }
+                        catch (Exception ex)
+                        {
+                            exception = ex;
+                            throw;
+                        }
+                        break;
+                    }
+                case LazyThreadSafetyMode.PublicationOnly:
+                    {
+                        var init_factory = factory;
+                        T v;
+
+                        //exceptions are ignored
+                        if (init_factory != null)
+                            v = init_factory();
+                        else
+                            v = default(T);
+
+                        lock (monitor)
+                        {
+                            if (inited)
+                                return value;
+                            value = v;
+                            Thread.MemoryBarrier();
+                            inited = true;
+                            factory = null;
+                        }
+                        break;
+                    }
+                case LazyThreadSafetyMode.ExecutionAndPublication:
+                    {
+                        lock (monitor)
+                        {
+                            if (inited)
+                                return value;
+
+                            if (factory == null)
+                                throw exception = new InvalidOperationException("The initialization function tries to access Value on this instance");
+
+                            var init_factory = factory;
+                            try
+                            {
+                                factory = null;
+                                T v = init_factory();
+                                value = v;
+                                Thread.MemoryBarrier();
+                                inited = true;
+                            }
+                            catch (Exception ex)
+                            {
+                                exception = ex;
+                                throw;
+                            }
+                        }
+                        break;
+                    }
+                default:
+                    throw new InvalidOperationException("Invalid LazyThreadSafetyMode " + mode);
+            }
+
+            if (monitor == null)
+            {
+                value = factory();
+                inited = true;
+            }
+            else
+            {
+                lock (monitor)
+                {
+                    if (inited)
+                        return value;
+
+                    if (factory == null)
+                        throw new InvalidOperationException("The initialization function tries to access Value on this instance");
+
+                    var init_factory = factory;
+                    try
+                    {
+                        factory = null;
+                        T v = init_factory();
+                        value = v;
+                        Thread.MemoryBarrier();
+                        inited = true;
+                    }
+                    catch
+                    {
+                        factory = init_factory;
+                        throw;
+                    }
+                }
+            }
+
+            return value;
+        }
+
+        public bool IsValueCreated
+        {
+            get
+            {
+                return inited;
+            }
+        }
+
+        public override string ToString()
+        {
+            if (inited)
+                return value.ToString();
+            else
+                return "Value is not created";
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 5b1aa86..e29ae2a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -50,43 +50,17 @@ using Nini.Config;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-    #region Enums
-
-    /// <summary>
-    /// Specifies the fields that have been changed when sending a prim or
-    /// avatar update
-    /// </summary>
-    [Flags]
-    public enum PrimUpdateFlags : uint
+    public class EntityUpdate
     {
-        None = 0,
-        AttachmentPoint = 1 << 0,
-        Material = 1 << 1,
-        ClickAction = 1 << 2,
-        Scale = 1 << 3,
-        ParentID = 1 << 4,
-        PrimFlags = 1 << 5,
-        PrimData = 1 << 6,
-        MediaURL = 1 << 7,
-        ScratchPad = 1 << 8,
-        Textures = 1 << 9,
-        TextureAnim = 1 << 10,
-        NameValue = 1 << 11,
-        Position = 1 << 12,
-        Rotation = 1 << 13,
-        Velocity = 1 << 14,
-        Acceleration = 1 << 15,
-        AngularVelocity = 1 << 16,
-        CollisionPlane = 1 << 17,
-        Text = 1 << 18,
-        Particles = 1 << 19,
-        ExtraData = 1 << 20,
-        Sound = 1 << 21,
-        Joint = 1 << 22,
-        FullUpdate = UInt32.MaxValue
-    }
+        public ISceneEntity Entity;
+        public PrimUpdateFlags Flags;
 
-    #endregion Enums
+        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
+        {
+            Entity = entity;
+            Flags = flags;
+        }
+    }
 
     public delegate bool PacketMethod(IClientAPI simClient, Packet packet);
 
@@ -350,9 +324,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private readonly IGroupsModule m_GroupsModule;
 
         private int m_cachedTextureSerial;
-        protected PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates;
-        private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates;
-        private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates;
+        private PriorityQueue<double, EntityUpdate> m_entityUpdates;
 
         /// <value>
         /// List used in construction of data blocks for an object update packet.  This is to stop us having to
@@ -466,9 +438,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             m_scene = scene;
 
-            m_avatarTerseUpdates = new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            m_primTerseUpdates = new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
-            m_primFullUpdates = new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(m_scene.Entities.Count);
+            m_entityUpdates = new PriorityQueue<double, EntityUpdate>(m_scene.Entities.Count);
             m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
             m_killRecord = new HashSet<uint>();
 
@@ -1519,7 +1489,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             kill.Header.Reliable = true;
             kill.Header.Zerocoded = true;
 
-            lock (m_primFullUpdates.SyncRoot)
+            lock (m_entityUpdates.SyncRoot)
             {
                 m_killRecord.Add(localID);
                 OutPacket(kill, ThrottleOutPacketType.State);
@@ -3419,67 +3389,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>
         /// Send an ObjectUpdate packet with information about an avatar
         /// </summary>
-        public void SendAvatarData(SendAvatarData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
+            ScenePresence presence = avatar as ScenePresence;
+            if (presence == null)
+                return;
+
             ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
             objupdate.Header.Zerocoded = true;
 
-            objupdate.RegionData.RegionHandle = data.RegionHandle;
+            objupdate.RegionData.RegionHandle = presence.RegionHandle;
             objupdate.RegionData.TimeDilation = ushort.MaxValue;
 
             objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data);
-            OutPacket(objupdate, ThrottleOutPacketType.Task);
-        }
-
-        /// <summary>
-        /// Send a terse positional/rotation/velocity update about an avatar
-        /// to the client.  This avatar can be that of the client itself.
-        /// </summary>
-        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-            if (data.Priority == double.NaN)
-            {
-                m_log.Error("[LLClientView] SendAvatarTerseUpdate received a NaN priority, dropping update");
-                return;
-            }
-
-            Quaternion rotation = data.Rotation;
-            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
-                rotation = Quaternion.Identity;
+            objupdate.ObjectData[0] = CreateAvatarUpdateBlock(presence);
 
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateImprovedTerseBlock(data);
-
-            lock (m_avatarTerseUpdates.SyncRoot)
-                m_avatarTerseUpdates.Enqueue(data.Priority, terseBlock, data.LocalID);
-
-            // If we received an update about our own avatar, process the avatar update priority queue immediately
-            if (data.AgentID == m_agentId)
-                ProcessAvatarTerseUpdates();
-        }
-
-        protected void ProcessAvatarTerseUpdates()
-        {
-            ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
-            terse.Header.Reliable = false;
-            terse.Header.Zerocoded = true;
-
-            //terse.RegionData = new ImprovedTerseObjectUpdatePacket.RegionDataBlock();
-            terse.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
-            terse.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
-
-            lock (m_avatarTerseUpdates.SyncRoot)
-            {
-                int count = Math.Min(m_avatarTerseUpdates.Count, m_udpServer.AvatarTerseUpdatesPerPacket);
-                if (count == 0)
-                    return;
-
-                terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
-                for (int i = 0; i < count; i++)
-                    terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue();
-            }
-
-            OutPacket(terse, ThrottleOutPacketType.State);
+            OutPacket(objupdate, ThrottleOutPacketType.Task);
         }
 
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
@@ -3526,172 +3451,187 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Primitive Packet/Data Sending Methods
 
-        public void SendPrimitiveToClient(SendPrimitiveData data)
+        /// <summary>
+        /// Generate one of the object update packets based on PrimUpdateFlags 
+        /// and broadcast the packet to clients
+        /// </summary>
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
-//            string text = data.text;
-//            if (text.IndexOf("\n") >= 0)
-//                text = text.Remove(text.IndexOf("\n"));
-//            m_log.DebugFormat(
-//                "[CLIENT]: Placing request to send full info about prim {0} text {1} to client {2}", 
-//                data.localID, text, Name);
-            
-            if (data.priority == double.NaN)
-            {
-                m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update");
-                return;
-            }
-
-            Quaternion rotation = data.rotation;
-            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
-                rotation = Quaternion.Identity;
-
-            if (data.AttachPoint > 30 && data.ownerID != AgentId) // Someone else's HUD
-                return;
-            if (data.primShape.State != 0 && data.parentID == 0 && data.primShape.PCode == 9)
-                return;
+            double priority;
 
-            ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data);
+            if (entity is SceneObjectPart)
+                priority = ((SceneObjectPart)entity).ParentGroup.GetUpdatePriority(this);
+            else if (entity is ScenePresence)
+                priority = ((ScenePresence)entity).GetUpdatePriority(this);
+            else
+                priority = 0.0d;
 
-            lock (m_primFullUpdates.SyncRoot)
-                m_primFullUpdates.Enqueue(data.priority, objectData, data.localID);
+            lock (m_entityUpdates.SyncRoot)
+                m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags), entity.LocalId);
         }
 
-        void ProcessPrimFullUpdates()
+        private void ProcessEntityUpdates(int maxUpdates)
         {
-            ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
-            outPacket.Header.Zerocoded = true;
+            Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+            Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+            Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
 
-            outPacket.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
-            outPacket.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
+            if (maxUpdates <= 0) maxUpdates = Int32.MaxValue;
+            int updatesThisCall = 0;
 
-            lock (m_primFullUpdates.SyncRoot)
+            lock (m_entityUpdates.SyncRoot)
             {
-                int count = Math.Min(m_primFullUpdates.Count, m_udpServer.PrimFullUpdatesPerPacket);
-                if (count == 0)
-                    return;
-
-                m_fullUpdateDataBlocksBuilder.Clear();
-                                
-                for (int i = 0; i < count; i++)
+                EntityUpdate update;
+                while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update))
                 {
-                    ObjectUpdatePacket.ObjectDataBlock block = m_primFullUpdates.Dequeue();
+                    ++updatesThisCall;
+
+                    #region UpdateFlags to packet type conversion
 
-                    if (!m_killRecord.Contains(block.ID))
+                    PrimUpdateFlags updateFlags = update.Flags;
+
+                    bool canUseCompressed = true;
+                    bool canUseImproved = true;
+
+                    // Compressed object updates only make sense for LL primitives
+                    if (!(update.Entity is SceneObjectPart))
+                        canUseCompressed = false;
+
+                    if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
                     {
-                        m_fullUpdateDataBlocksBuilder.Add(block);
-                        
-//                    string text = Util.FieldToString(outPacket.ObjectData[i].Text);
-//                    if (text.IndexOf("\n") >= 0)
-//                        text = text.Remove(text.IndexOf("\n"));
-//                    m_log.DebugFormat(
-//                        "[CLIENT]: Sending full info about prim {0} text {1} to client {2}", 
-//                        outPacket.ObjectData[i].ID, text, Name);
+                        canUseCompressed = false;
+                        canUseImproved = false;
+                    }
+                    else
+                    {
+                        if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
+                        {
+                            canUseCompressed = false;
+                        }
+
+                        if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Text) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Material) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
+                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
+                        {
+                            canUseImproved = false;
+                        }
+                    }
+
+                    #endregion UpdateFlags to packet type conversion
+
+                    #region Block Construction
+
+                    // TODO: Remove this once we can build compressed updates
+                    canUseCompressed = false;
+
+                    if (!canUseImproved && !canUseCompressed)
+                    {
+                        if (update.Entity is ScenePresence)
+                            objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
+                        else
+                            objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
+                    }
+                    else if (!canUseImproved)
+                    {
+                        compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
                     }
-//                    else
-//                    {
-//                        m_log.WarnFormat(
-//                            "[CLIENT]: Preventing full update for {0} after kill to {1}", block.ID, Name);                        
-//                    }
+                    else
+                    {
+                        terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                    }
+
+                    #endregion Block Construction
                 }
+            }
 
-                outPacket.ObjectData = m_fullUpdateDataBlocksBuilder.ToArray();
-                
-                OutPacket(outPacket, ThrottleOutPacketType.State);
-            }            
-        }
+            #region Packet Sending
 
-        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
-        {
-            if (data.Priority == double.NaN)
+            const float TIME_DILATION = 1.0f;
+            ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
+
+            if (objectUpdateBlocks.IsValueCreated)
             {
-                m_log.Error("[LLClientView] SendPrimTerseUpdate received a NaN priority, dropping update");
-                return;
-            }
+                List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
 
-            Quaternion rotation = data.Rotation;
-            if (rotation.W == 0.0f && rotation.X == 0.0f && rotation.Y == 0.0f && rotation.Z == 0.0f)
-                rotation = Quaternion.Identity;
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
 
-            if (data.AttachPoint > 30 && data.OwnerID != AgentId) // Someone else's HUD
-                return;
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
 
-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock objectData = CreateImprovedTerseBlock(data);
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
 
-            lock (m_primTerseUpdates.SyncRoot)
-                m_primTerseUpdates.Enqueue(data.Priority, objectData, data.LocalID);
-        }
+            if (compressedUpdateBlocks.IsValueCreated)
+            {
+                List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
 
-        void ProcessPrimTerseUpdates()
-        {
-            ImprovedTerseObjectUpdatePacket outPacket = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
-            outPacket.Header.Reliable = false;
-            outPacket.Header.Zerocoded = true;
+                ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
 
-            outPacket.RegionData.RegionHandle = Scene.RegionInfo.RegionHandle;
-            outPacket.RegionData.TimeDilation = (ushort)(Scene.TimeDilation * ushort.MaxValue);
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
 
-            lock (m_primTerseUpdates.SyncRoot)
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+
+            if (terseUpdateBlocks.IsValueCreated)
             {
-                int count = Math.Min(m_primTerseUpdates.Count, m_udpServer.PrimTerseUpdatesPerPacket);
-                if (count == 0)
-                    return;
+                List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
 
-                outPacket.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count];
-                for (int i = 0; i < count; i++)
-                    outPacket.ObjectData[i] = m_primTerseUpdates.Dequeue();
+                ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
             }
 
-            OutPacket(outPacket, ThrottleOutPacketType.State);
+            #endregion Packet Sending
         }
 
-        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
-            PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>.UpdatePriorityHandler terse_update_priority_handler =
-                delegate(ref double priority, uint local_id)
-                {
-                    priority = handler(new UpdatePriorityData(priority, local_id));
-                    return priority != double.NaN;
-                };
-            PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>.UpdatePriorityHandler update_priority_handler =
+            //m_log.Debug("[CLIENT]: Reprioritizing prim updates for " + m_firstName + " " + m_lastName);
+
+            PriorityQueue<double, EntityUpdate>.UpdatePriorityHandler update_priority_handler =
                 delegate(ref double priority, uint local_id)
                 {
                     priority = handler(new UpdatePriorityData(priority, local_id));
                     return priority != double.NaN;
                 };
 
-            if ((type & StateUpdateTypes.AvatarTerse) != 0)
-            {
-                lock (m_avatarTerseUpdates.SyncRoot)
-                    m_avatarTerseUpdates.Reprioritize(terse_update_priority_handler);
-            }
-
-            if ((type & StateUpdateTypes.PrimitiveFull) != 0)
-            {
-                lock (m_primFullUpdates.SyncRoot)
-                    m_primFullUpdates.Reprioritize(update_priority_handler);
-            }
-
-            if ((type & StateUpdateTypes.PrimitiveTerse) != 0)
-            {
-                lock (m_primTerseUpdates.SyncRoot)
-                    m_primTerseUpdates.Reprioritize(terse_update_priority_handler);
-            }
+            lock (m_entityUpdates.SyncRoot)
+                m_entityUpdates.Reprioritize(update_priority_handler);
         }
 
         public void FlushPrimUpdates()
         {
-            while (m_primFullUpdates.Count > 0)
-            {
-                ProcessPrimFullUpdates();
-            }
-            while (m_primTerseUpdates.Count > 0)
-            {
-                ProcessPrimTerseUpdates();
-            }
-            while (m_avatarTerseUpdates.Count > 0)
-            {
-                ProcessAvatarTerseUpdates();
-            }
+            m_log.Debug("[CLIENT]: Flushing prim updates to " + m_firstName + " " + m_lastName);
+
+            while (m_entityUpdates.Count > 0)
+                ProcessEntityUpdates(-1);
         }
 
         #endregion Primitive Packet/Data Sending Methods
@@ -3724,26 +3664,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
             {
-                lock (m_avatarTerseUpdates.SyncRoot)
-                {
-                    if (m_avatarTerseUpdates.Count > 0)
-                        ProcessAvatarTerseUpdates();
-                }
-            }
-
-            if ((categories & ThrottleOutPacketTypeFlags.State) != 0)
-            {
-                lock (m_primFullUpdates.SyncRoot)
-                {
-                    if (m_primFullUpdates.Count > 0)
-                        ProcessPrimFullUpdates();
-                }
-
-                lock (m_primTerseUpdates.SyncRoot)
-                {
-                    if (m_primTerseUpdates.Count > 0)
-                        ProcessPrimTerseUpdates();
-                }
+                if (m_entityUpdates.Count > 0)
+                    ProcessEntityUpdates(m_udpServer.PrimUpdatesPerCallback);
             }
 
             if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
@@ -4404,22 +4326,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Helper Methods
 
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendAvatarTerseData data)
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(ISceneEntity entity, bool sendTexture)
         {
-            return CreateImprovedTerseBlock(true, data.LocalID, 0, data.CollisionPlane, data.Position, data.Velocity,
-                data.Acceleration, data.Rotation, Vector3.Zero, data.TextureEntry);
-        }
+            #region ScenePresence/SOP Handling
 
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendPrimitiveTerseData data)
-        {
-            return CreateImprovedTerseBlock(false, data.LocalID, data.AttachPoint, Vector4.Zero, data.Position, data.Velocity,
-                data.Acceleration, data.Rotation, data.AngularVelocity, data.TextureEntry);
-        }
+            bool avatar = (entity is ScenePresence);
+            uint localID = entity.LocalId;
+            uint attachPoint;
+            Vector4 collisionPlane;
+            Vector3 position, velocity, acceleration, angularVelocity;
+            Quaternion rotation;
+            byte[] textureEntry;
+
+            if (entity is ScenePresence)
+            {
+                ScenePresence presence = (ScenePresence)entity;
+
+                attachPoint = 0;
+                collisionPlane = presence.CollisionPlane;
+                position = presence.OffsetPosition;
+                velocity = presence.Velocity;
+                acceleration = Vector3.Zero;
+                angularVelocity = Vector3.Zero;
+                rotation = presence.Rotation;
+
+                if (sendTexture)
+                    textureEntry = presence.Appearance.Texture.GetBytes();
+                else
+                    textureEntry = null;
+            }
+            else
+            {
+                SceneObjectPart part = (SceneObjectPart)entity;
+
+                attachPoint = part.AttachmentPoint;
+                collisionPlane = Vector4.Zero;
+                position = part.RelativePosition;
+                velocity = part.Velocity;
+                acceleration = part.Acceleration;
+                angularVelocity = part.AngularVelocity;
+                rotation = part.RotationOffset;
+
+                if (sendTexture)
+                    textureEntry = part.Shape.TextureEntry;
+                else
+                    textureEntry = null;
+            }
+
+            #endregion ScenePresence/SOP Handling
 
-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(bool avatar, uint localID, int attachPoint,
-            Vector4 collisionPlane, Vector3 position, Vector3 velocity, Vector3 acceleration, Quaternion rotation,
-            Vector3 angularVelocity, byte[] textureEntry)
-        {
             int pos = 0;
             byte[] data = new byte[(avatar ? 60 : 44)];
 
@@ -4491,12 +4446,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return block;
         }
 
-        protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(SendAvatarData data)
+        protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
         {
             byte[] objectData = new byte[76];
 
-            Vector4.UnitW.ToBytes(objectData, 0); // TODO: Collision plane support
-            data.Position.ToBytes(objectData, 16);
+            data.CollisionPlane.ToBytes(objectData, 0);
+            data.OffsetPosition.ToBytes(objectData, 16);
             //data.Velocity.ToBytes(objectData, 28);
             //data.Acceleration.ToBytes(objectData, 40);
             data.Rotation.ToBytes(objectData, 52);
@@ -4506,12 +4461,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             update.Data = Utils.EmptyBytes;
             update.ExtraParams = new byte[1];
-            update.FullID = data.AvatarID;
-            update.ID = data.AvatarLocalID;
+            update.FullID = data.UUID;
+            update.ID = data.LocalId;
             update.Material = (byte)Material.Flesh;
             update.MediaURL = Utils.EmptyBytes;
-            update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.FirstName + "\nLastName STRING RW SV " +
-                data.LastName + "\nTitle STRING RW SV " + data.GroupTitle);
+            update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
+                data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
             update.ObjectData = objectData;
             update.ParentID = data.ParentID;
             update.PathCurve = 16;
@@ -4520,102 +4475,116 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.PCode = (byte)PCode.Avatar;
             update.ProfileCurve = 1;
             update.PSBlock = Utils.EmptyBytes;
-            update.Scale = new Vector3(0.45f,0.6f,1.9f);
+            update.Scale = new Vector3(0.45f, 0.6f, 1.9f);
             update.Text = Utils.EmptyBytes;
             update.TextColor = new byte[4];
             update.TextureAnim = Utils.EmptyBytes;
-            update.TextureEntry = data.TextureEntry ?? Utils.EmptyBytes;
-            update.UpdateFlags = (uint)(PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | PrimFlags.ObjectOwnerModify);//61 + (9 << 8) + (130 << 16) + (16 << 24); // TODO: Replace these numbers with PrimFlags
+            update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
+            update.UpdateFlags = (uint)(
+                PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
+                PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
+                PrimFlags.ObjectOwnerModify);
 
             return update;
         }
 
-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SendPrimitiveData data)
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(SceneObjectPart data, UUID recipientID)
         {
             byte[] objectData = new byte[60];
-            data.pos.ToBytes(objectData, 0);
-            data.vel.ToBytes(objectData, 12);
-            data.acc.ToBytes(objectData, 24);
-            data.rotation.ToBytes(objectData, 36);
-            data.rvel.ToBytes(objectData, 48);
+            data.RelativePosition.ToBytes(objectData, 0);
+            data.Velocity.ToBytes(objectData, 12);
+            data.Acceleration.ToBytes(objectData, 24);
+            data.RotationOffset.ToBytes(objectData, 36);
+            data.AngularVelocity.ToBytes(objectData, 48);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
-            update.ClickAction = (byte)data.clickAction;
+            update.ClickAction = (byte)data.ClickAction;
             update.CRC = 0;
-            update.ExtraParams = data.primShape.ExtraParams ?? Utils.EmptyBytes;
-            update.FullID = data.objectID;
-            update.ID = data.localID;
+            update.ExtraParams = data.Shape.ExtraParams ?? Utils.EmptyBytes;
+            update.FullID = data.UUID;
+            update.ID = data.LocalId;
             //update.JointAxisOrAnchor = Vector3.Zero; // These are deprecated
             //update.JointPivot = Vector3.Zero;
             //update.JointType = 0;
-            update.Material = data.material;
+            update.Material = data.Material;
             update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
-            if (data.attachment)
+            if (data.IsAttachment)
             {
-                update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.AssetId);
-                update.State = (byte)((data.AttachPoint % 16) * 16 + (data.AttachPoint / 16));
+                update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.FromItemID);
+                update.State = (byte)((data.AttachmentPoint % 16) * 16 + (data.AttachmentPoint / 16));
             }
             else
             {
                 update.NameValue = Utils.EmptyBytes;
-                update.State = data.primShape.State;
+                update.State = data.Shape.State;
             }
+
             update.ObjectData = objectData;
-            update.ParentID = data.parentID;
-            update.PathBegin = data.primShape.PathBegin;
-            update.PathCurve = data.primShape.PathCurve;
-            update.PathEnd = data.primShape.PathEnd;
-            update.PathRadiusOffset = data.primShape.PathRadiusOffset;
-            update.PathRevolutions = data.primShape.PathRevolutions;
-            update.PathScaleX = data.primShape.PathScaleX;
-            update.PathScaleY = data.primShape.PathScaleY;
-            update.PathShearX = data.primShape.PathShearX;
-            update.PathShearY = data.primShape.PathShearY;
-            update.PathSkew = data.primShape.PathSkew;
-            update.PathTaperX = data.primShape.PathTaperX;
-            update.PathTaperY = data.primShape.PathTaperY;
-            update.PathTwist = data.primShape.PathTwist;
-            update.PathTwistBegin = data.primShape.PathTwistBegin;
-            update.PCode = data.primShape.PCode;
-            update.ProfileBegin = data.primShape.ProfileBegin;
-            update.ProfileCurve = data.primShape.ProfileCurve;
-            update.ProfileEnd = data.primShape.ProfileEnd;
-            update.ProfileHollow = data.primShape.ProfileHollow;
-            update.PSBlock = data.particleSystem ?? Utils.EmptyBytes;
-            update.TextColor = data.color ?? Color4.Black.GetBytes(true);
-            update.TextureAnim = data.textureanim ?? Utils.EmptyBytes;
-            update.TextureEntry = data.primShape.TextureEntry ?? Utils.EmptyBytes;
-            update.Scale = data.primShape.Scale;
-            update.Text = Util.StringToBytes256(data.text);
-            update.UpdateFlags = (uint)data.flags;
-
-            if (data.SoundId != UUID.Zero)
-            {
-                update.Sound = data.SoundId;
-                update.OwnerID = data.ownerID;
-                update.Gain = (float)data.SoundVolume;
+            update.ParentID = data.ParentID;
+            update.PathBegin = data.Shape.PathBegin;
+            update.PathCurve = data.Shape.PathCurve;
+            update.PathEnd = data.Shape.PathEnd;
+            update.PathRadiusOffset = data.Shape.PathRadiusOffset;
+            update.PathRevolutions = data.Shape.PathRevolutions;
+            update.PathScaleX = data.Shape.PathScaleX;
+            update.PathScaleY = data.Shape.PathScaleY;
+            update.PathShearX = data.Shape.PathShearX;
+            update.PathShearY = data.Shape.PathShearY;
+            update.PathSkew = data.Shape.PathSkew;
+            update.PathTaperX = data.Shape.PathTaperX;
+            update.PathTaperY = data.Shape.PathTaperY;
+            update.PathTwist = data.Shape.PathTwist;
+            update.PathTwistBegin = data.Shape.PathTwistBegin;
+            update.PCode = data.Shape.PCode;
+            update.ProfileBegin = data.Shape.ProfileBegin;
+            update.ProfileCurve = data.Shape.ProfileCurve;
+            update.ProfileEnd = data.Shape.ProfileEnd;
+            update.ProfileHollow = data.Shape.ProfileHollow;
+            update.PSBlock = data.ParticleSystem ?? Utils.EmptyBytes;
+            update.TextColor = data.GetTextColor().GetBytes(false);
+            update.TextureAnim = data.TextureAnimation ?? Utils.EmptyBytes;
+            update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
+            update.Scale = data.Shape.Scale;
+            update.Text = Util.StringToBytes256(data.Text);
+
+            #region PrimFlags
+
+            PrimFlags flags = (PrimFlags)m_scene.Permissions.GenerateClientFlags(recipientID, data.UUID);
+
+            // Don't send the CreateSelected flag to everyone
+            flags &= ~PrimFlags.CreateSelected;
+
+            if (recipientID == data.OwnerID)
+            {
+                if ((data.Flags & PrimFlags.CreateSelected) != 0)
+                {
+                    // Only send this flag once, then unset it
+                    flags |= PrimFlags.CreateSelected;
+                    data.Flags &= ~PrimFlags.CreateSelected;
+                }
+            }
+
+            update.UpdateFlags = (uint)flags;
+
+            #endregion PrimFlags
+
+            if (data.Sound != UUID.Zero)
+            {
+                update.Sound = data.Sound;
+                update.OwnerID = data.OwnerID;
+                update.Gain = (float)data.SoundGain;
                 update.Radius = (float)data.SoundRadius;
                 update.Flags = data.SoundFlags;
             }
 
-            switch ((PCode)data.primShape.PCode)
+            switch ((PCode)data.Shape.PCode)
             {
                 case PCode.Grass:
                 case PCode.Tree:
                 case PCode.NewTree:
-                    update.Data = new byte[] { data.primShape.State };
+                    update.Data = new byte[] { data.Shape.State };
                     break;
                 default:
-                    // TODO: Support ScratchPad
-                    //if (prim.ScratchPad != null)
-                    //{
-                    //    update.Data = new byte[prim.ScratchPad.Length];
-                    //    Buffer.BlockCopy(prim.ScratchPad, 0, update.Data, 0, update.Data.Length);
-                    //}
-                    //else
-                    //{
-                    //    update.Data = Utils.EmptyBytes;
-                    //}
                     update.Data = Utils.EmptyBytes;
                     break;
             }
@@ -4623,6 +4592,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return update;
         }
 
+        protected ObjectUpdateCompressedPacket.ObjectDataBlock CreateCompressedUpdateBlock(SceneObjectPart part, PrimUpdateFlags updateFlags)
+        {
+            // TODO: Implement this
+            return null;
+        }
+
         public void SendNameReply(UUID profileId, string firstname, string lastname)
         {
             UUIDNameReplyPacket packet = (UUIDNameReplyPacket)PacketPool.Instance.GetPacket(PacketType.UUIDNameReply);
@@ -11672,7 +11647,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 throw new InvalidOperationException(string.Format("The {0} is empty", this.GetType().ToString()));
             }
 
-            internal TValue Dequeue()
+            internal bool TryDequeue(out TValue value)
             {
                 for (int i = 0; i < m_heaps.Length; ++i)
                 {
@@ -11680,10 +11655,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     {
                         MinHeapItem item = m_heaps[i].RemoveMin();
                         m_lookupTable.Remove(item.LocalID);
-                        return item.Value;
+                        value = item.Value;
+                        return true;
                     }
                 }
-                throw new InvalidOperationException(string.Format("The {0} is empty", this.GetType().ToString()));
+
+                value = default(TValue);
+                return false;
             }
 
             internal void Reprioritize(UpdatePriorityHandler handler)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index d708055..cda461c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -99,15 +99,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         /// <summary>The measured resolution of Environment.TickCount</summary>
         public readonly float TickCountResolution;
-        /// <summary>Number of terse prim updates to put on the queue each time the
+        /// <summary>Number of prim updates to put on the queue each time the 
         /// OnQueueEmpty event is triggered for updates</summary>
-        public readonly int PrimTerseUpdatesPerPacket;
-        /// <summary>Number of terse avatar updates to put on the queue each time the
-        /// OnQueueEmpty event is triggered for updates</summary>
-        public readonly int AvatarTerseUpdatesPerPacket;
-        /// <summary>Number of full prim updates to put on the queue each time the
-        /// OnQueueEmpty event is triggered for updates</summary>
-        public readonly int PrimFullUpdatesPerPacket;
+        public readonly int PrimUpdatesPerCallback;
         /// <summary>Number of texture packets to put on the queue each time the
         /// OnQueueEmpty event is triggered for textures</summary>
         public readonly int TextureSendLimit;
@@ -191,9 +185,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 m_recvBufferSize = config.GetInt("client_socket_rcvbuf_size", 0);
                 sceneThrottleBps = config.GetInt("scene_throttle_max_bps", 0);
 
-                PrimTerseUpdatesPerPacket = config.GetInt("PrimTerseUpdatesPerPacket", 25);
-                AvatarTerseUpdatesPerPacket = config.GetInt("AvatarTerseUpdatesPerPacket", 10);
-                PrimFullUpdatesPerPacket = config.GetInt("PrimFullUpdatesPerPacket", 100);
+                PrimUpdatesPerCallback = config.GetInt("PrimUpdatesPerCallback", 100);
                 TextureSendLimit = config.GetInt("TextureSendLimit", 20);
 
                 m_defaultRTO = config.GetInt("DefaultRTO", 0);
@@ -201,9 +193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             else
             {
-                PrimTerseUpdatesPerPacket = 25;
-                AvatarTerseUpdatesPerPacket = 10;
-                PrimFullUpdatesPerPacket = 100;
+                PrimUpdatesPerCallback = 100;
                 TextureSendLimit = 20;
             }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 6c01927..83c8eac 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             // But we could trigger the position update more often
             scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
             scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel;
 
             if (m_aScene == null)
                 m_aScene = scene;
@@ -105,12 +104,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
         }
 
-        void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID)
-        {
-            // TODO: grab the parcel ID from ILandModule
-            // and send that along
-            m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-        }
-
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 1fbc733..1ad4db2 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -154,6 +154,22 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landManagementModule.UpdateLandObject(localID, data);
             }
         }
+
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            if (m_landManagementModule != null)
+            {
+                m_landManagementModule.Join(start_x, start_y, end_x, end_y, attempting_user_id);
+            }
+        }
+
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            if (m_landManagementModule != null)
+            {
+                m_landManagementModule.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
+            }
+        }
         
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index d05235e..9d6c9a9 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -956,6 +956,16 @@ namespace OpenSim.Region.CoreModules.World.Land
             masterLandObject.SendLandUpdateToAvatarsOverMe();
         }
 
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            join(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+
         #endregion
 
         #region Parcel Updating
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index c454d1f..b6b25ea 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -528,14 +528,6 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
-        public virtual void SendAvatarData(SendAvatarData data)
-        {
-        }
-
-        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-        }
-
         public virtual void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
         }
@@ -548,15 +540,15 @@ namespace OpenSim.Region.Examples.SimpleModule
         {
         }
 
-        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
         }
 
-        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
         }
 
-        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index f71e31d..20b8ab6 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -76,5 +76,8 @@ namespace OpenSim.Region.Framework.Interfaces
         void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
         void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
         void SetParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime);
+
+        void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
+        void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 48e65a5..d174d04 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Scenes
 
     #endregion Enumerations
 
-    public class SceneObjectPart : IScriptHost
+    public class SceneObjectPart : IScriptHost, ISceneEntity
     {
         /// <value>
         /// Denote all sides of the prim
@@ -714,6 +714,24 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public Vector3 RelativePosition
+        {
+            get
+            {
+                if (IsRoot)
+                {
+                    if (IsAttachment)
+                        return AttachedPos;
+                    else
+                        return AbsolutePosition;
+                }
+                else
+                {
+                    return OffsetPosition;
+                }
+            }
+        }
+
         public Quaternion RotationOffset
         {
             get
@@ -985,7 +1003,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return AggregateScriptEvents; }
         }
 
-
         public Quaternion SitTargetOrientation
         {
             get { return m_sitTargetOrientation; }
@@ -2911,11 +2928,7 @@ namespace OpenSim.Region.Framework.Scenes
             //if (LocalId != ParentGroup.RootPart.LocalId)
                 //isattachment = ParentGroup.RootPart.IsAttachment;
 
-            byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A};
-            remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, m_parentGroup.GetTimeDilation(), LocalId, m_shape,
-                                               lPos, Velocity, Acceleration, RotationOffset, AngularVelocity, clientFlags, m_uuid, _ownerID,
-                                               m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment,
-                                               AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient)));
+            remoteClient.SendPrimUpdate(this, PrimUpdateFlags.FullUpdate);
         }
 
         /// <summary>
@@ -4627,11 +4640,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             // Causes this thread to dig into the Client Thread Data.
             // Remember your locking here!
-            remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle,
-                    m_parentGroup.GetTimeDilation(), LocalId, lPos,
-                    RotationOffset, Velocity, Acceleration,
-                    AngularVelocity, FromItemID,
-                    OwnerID, (int)AttachmentPoint, null, ParentGroup.GetUpdatePriority(remoteClient)));
+            remoteClient.SendPrimUpdate(this, PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
         }
                 
         public void AddScriptLPS(int count)
@@ -4681,7 +4690,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Color4 GetTextColor()
         {
-            return new Color4((byte)Color.R, (byte)Color.G, (byte)Color.B, (byte)(0xFF - Color.A));
+            Color color = Color;
+            return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
         }
 
         public void ResetOwnerChangeFlag()
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ad66273..179ecdc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Framework.Scenes
 
     public delegate void SendCourseLocationsMethod(UUID scene, ScenePresence presence);
 
-    public class ScenePresence : EntityBase
+    public class ScenePresence : EntityBase, ISceneEntity
     {
 //        ~ScenePresence()
 //        {
@@ -491,6 +491,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public Vector3 OffsetPosition
+        {
+            get { return m_pos; }
+            set { m_pos = value; }
+        }
+
         /// <summary>
         /// Current velocity of the avatar.
         /// </summary>
@@ -1120,8 +1126,9 @@ namespace OpenSim.Region.Framework.Scenes
             
             m_updateCount = UPDATE_COUNT;                               //KF: Trigger Anim updates to catch falling anim. 
             
-            ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
-                    AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
+            ControllingClient.SendPrimUpdate(this, PrimUpdateFlags.Position);
+            //ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
+            //        AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
         }
 
         public void AddNeighbourRegion(ulong regionHandle, string cap)
@@ -2604,8 +2611,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
 
                 //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity);
 
-                remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
-                    pos, velocity, Vector3.Zero, m_bodyRot, CollisionPlane, m_uuid, null, GetUpdatePriority(remoteClient)));
+                remoteClient.SendPrimUpdate(this, PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
 
                 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
                 m_scene.StatsReporter.AddAgentUpdates(1);
@@ -2701,9 +2707,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             Vector3 pos = m_pos;
             pos.Z += m_appearance.HipOffset;
 
-            remoteAvatar.m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid,
-                                                            LocalId, pos, m_appearance.Texture.GetBytes(),
-                                                            m_parentID, m_bodyRot));
+            remoteAvatar.m_controllingClient.SendAvatarDataImmediate(this);
             m_scene.StatsReporter.AddAgentUpdates(1);
         }
 
@@ -2771,8 +2775,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             Vector3 pos = m_pos;
             pos.Z += m_appearance.HipOffset;
 
-            m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
-                                               pos, m_appearance.Texture.GetBytes(), m_parentID, m_bodyRot));
+            m_controllingClient.SendAvatarDataImmediate(this);
 
             SendInitialFullUpdateToAllClients();
             SendAppearanceToAllOtherAgents();
@@ -2882,9 +2885,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             Vector3 pos = m_pos;
             pos.Z += m_appearance.HipOffset;
 
-            m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId,
-                pos, m_appearance.Texture.GetBytes(), m_parentID, m_bodyRot));
-
+            m_controllingClient.SendAvatarDataImmediate(this);
         }
 
         public void SetWearable(int wearableId, AvatarWearable wearable)
@@ -4219,7 +4220,7 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
 
         private void Reprioritize(object sender, ElapsedEventArgs e)
         {
-            m_controllingClient.ReprioritizeUpdates(StateUpdateTypes.All, UpdatePriority);
+            m_controllingClient.ReprioritizeUpdates(UpdatePriority);
 
             lock (m_reprioritization_timer)
             {
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index cab640b..fb8543b 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1054,16 +1054,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendAvatarData(SendAvatarData data)
-        {
-            
-        }
-
-        public void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-            
-        }
-
         public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
             
@@ -1074,32 +1064,27 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SetChildAgentThrottle(byte[] throttle)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
-            
-        }
 
-        public void SendPrimitiveToClient(SendPrimitiveData data)
-        {
-            
         }
 
-        public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
-            
+
         }
 
-        public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
 
         }
 
-        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
+        public void FlushPrimUpdates()
         {
-            
+
         }
 
-        public void FlushPrimUpdates()
+        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
         {
             
         }
@@ -1429,6 +1414,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
+        public virtual void SetChildAgentThrottle(byte[] throttle)
+        {
+
+        }
+
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index b828357..3cbc538 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -618,14 +618,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendAvatarData(SendAvatarData data)
-        {
-        }
-
-        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-        }
-
         public virtual void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
         }
@@ -638,15 +630,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
         }
 
-        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
         }
 
-        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index 9da818a..33ff707 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -140,6 +140,16 @@ public class RegionCombinerLargeLandChannel : ILandChannel
             RootRegionLandChannel.UpdateLandObject(localID, data);
         }
 
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            RootRegionLandChannel.Join(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        {
+            RootRegionLandChannel.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
+        }
+        
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
             RootRegionLandChannel.ReturnObjectsInParcel(localID, returnType, agentIDs, taskIDs, remoteClient);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9474bab..942e4ef 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1127,7 +1127,89 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 0.0f;
         }
 
+        // Routines for creating and managing parcels programmatically
+        public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osParcelJoin");
+            m_host.AddScriptLPS(1);
+
+            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
+            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
+            int endx = (int)(pos1.x > pos2.x ? pos1.x : pos2.x);
+            int endy = (int)(pos1.y > pos2.y ? pos1.y : pos2.y);
+
+            World.LandChannel.Join(startx,starty,endx,endy,m_host.OwnerID);
+        }
+          
+        public void osParcelSubdivide(LSL_Vector pos1, LSL_Vector pos2)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osParcelSubdivide");
+            m_host.AddScriptLPS(1);
+
+            int startx = (int)(pos1.x < pos2.x ? pos1.x : pos2.x);
+            int starty = (int)(pos1.y < pos2.y ? pos1.y : pos2.y);
+            int endx = (int)(pos1.x > pos2.x ? pos1.x : pos2.x);
+            int endy = (int)(pos1.y > pos2.y ? pos1.y : pos2.y);
 
+            World.LandChannel.Subdivide(startx,starty,endx,endy,m_host.OwnerID);
+        }
+
+        public void osParcelSetDetails(LSL_Vector pos, LSL_List rules)
+        {
+            CheckThreatLevel(ThreatLevel.High, "osParcelSetDetails");
+            m_host.AddScriptLPS(1);
+
+            // Get a reference to the land data and make sure the owner of the script
+            // can modify it
+
+            ILandObject startLandObject = World.LandChannel.GetLandObject((int)pos.x, (int)pos.y);
+            if (startLandObject == null)
+            {
+                OSSLShoutError("There is no land at that location");
+                return;
+            }
+
+            if (! World.Permissions.CanEditParcel(m_host.OwnerID, startLandObject))
+            {
+                OSSLShoutError("You do not have permission to modify the parcel");
+                return;
+            }
+
+            // Create a new land data object we can modify
+            LandData newLand = startLandObject.LandData.Copy();
+            UUID uuid;
+
+            // Process the rules, not sure what the impact would be of changing owner or group
+            for (int idx = 0; idx < rules.Length; )
+            {
+                int code = rules.GetLSLIntegerItem(idx++);
+                string arg = rules.GetLSLStringItem(idx++);
+                switch (code)
+                {
+                    case 0:
+                      newLand.Name = arg;
+                      break;
+
+                    case 1:
+                      newLand.Description = arg;
+                      break;
+
+                    case 2:
+                      CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails");
+                      if (UUID.TryParse(arg , out uuid))
+                          newLand.OwnerID = uuid;
+                      break;
+
+                    case 3:
+                      CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails");
+                      if (UUID.TryParse(arg , out uuid))
+                          newLand.GroupID = uuid;
+                      break;
+                }
+            }
+
+            World.LandChannel.UpdateLandObject(newLand.LocalID,newLand);
+        }
 
         public double osList2Double(LSL_Types.list src, int index)
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index f5921e1..9dbd369 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -123,6 +123,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         void osWindParamSet(string plugin, string param, float value);
         float osWindParamGet(string plugin, string param);
 
+        // Parcel commands
+        void osParcelJoin(vector pos1, vector pos2);
+        void osParcelSubdivide(vector pos1, vector pos2);
+        void osParcelSetDetails(vector pos, LSL_List rules);
 
         string osGetScriptEngineName();
         string osGetSimulatorVersion();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 3870af3..fd9309a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -106,6 +106,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 //            return m_OSSL_Functions.osWindParamGet(plugin, param);
 //        }
 
+        public void osParcelJoin(vector pos1, vector pos2)
+        {
+            m_OSSL_Functions.osParcelJoin(pos1,pos2);
+        }
+
+        public void osParcelSubdivide(vector pos1, vector pos2)
+        {
+            m_OSSL_Functions.osParcelSubdivide(pos1, pos2);
+        }
+        
+        public void osParcelSetDetails(vector pos, LSL_List rules)
+        {
+            m_OSSL_Functions.osParcelSetDetails(pos,rules);
+        }
+
         public double osList2Double(LSL_Types.list src, int index)
         {
             return m_OSSL_Functions.osList2Double(src, index);
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index b4500a5..600ddfd 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Connectors
         }
 
 
-        #region IPresenceService
+        #region IGridUserService
 
 
         public GridUserInfo LoggedIn(string userID)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
new file mode 100644
index 0000000..a871d07
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianActivityDetector.cs
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    public class SimianActivityDetector
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private SimianPresenceServiceConnector m_GridUserService;
+        private Scene m_aScene;
+
+        public SimianActivityDetector(SimianPresenceServiceConnector guservice)
+        {
+            m_GridUserService = guservice;
+            m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Started");
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            // For now the only events we listen to are these
+            // But we could trigger the position update more often
+            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
+            scene.EventManager.OnNewClient += OnNewClient;
+            scene.EventManager.OnAvatarEnteringNewParcel += OnEnteringNewParcel;
+
+            if (m_aScene == null)
+                m_aScene = scene;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnMakeRootAgent -= OnMakeRootAgent;
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnAvatarEnteringNewParcel -= OnEnteringNewParcel;
+        }
+
+        public void OnMakeRootAgent(ScenePresence sp)
+        {
+            m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
+            m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+        }
+
+        public void OnNewClient(IClientAPI client)
+        {
+            client.OnConnectionClosed += OnConnectionClose;
+        }
+
+        public void OnConnectionClose(IClientAPI client)
+        {
+            if (client.IsLoggingOut)
+            {
+                object sp = null;
+                Vector3 position = new Vector3(128, 128, 0);
+                Vector3 lookat = new Vector3(0, 1, 0);
+
+                if (client.Scene.TryGetScenePresence(client.AgentId, out sp))
+                {
+                    if (sp is ScenePresence)
+                    {
+                        if (((ScenePresence)sp).IsChildAgent)
+                            return;
+
+                        position = ((ScenePresence)sp).AbsolutePosition;
+                        lookat = ((ScenePresence)sp).Lookat;
+                    }
+                }
+
+                m_log.DebugFormat("[SIMIAN ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
+                m_GridUserService.LoggedOut(client.AgentId.ToString(), client.Scene.RegionInfo.RegionID, position, lookat);
+            }
+
+        }
+
+        void OnEnteringNewParcel(ScenePresence sp, int localLandID, UUID regionID)
+        {
+            m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+        }
+    }
+}
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index b86c45c..6f17931 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private string m_serverUrl = String.Empty;
+        private SimianActivityDetector m_activityDetector;
 
         #region ISharedRegionModule
 
@@ -66,7 +67,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public void PostInitialise() { }
         public void Close() { }
 
-        public SimianPresenceServiceConnector() { }
+        public SimianPresenceServiceConnector() { m_activityDetector = new SimianActivityDetector(this); }
         public string Name { get { return "SimianPresenceServiceConnector"; } }
         public void AddRegion(Scene scene)
         {
@@ -75,9 +76,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 scene.RegisterModuleInterface<IPresenceService>(this);
                 scene.RegisterModuleInterface<IGridUserService>(this);
 
-                scene.EventManager.OnMakeRootAgent += MakeRootAgentHandler;
-                scene.EventManager.OnNewClient += NewClientHandler;
-                scene.EventManager.OnSignificantClientMovement += SignificantClientMovementHandler;
+                m_activityDetector.AddRegion(scene);
 
                 LogoutRegionAgents(scene.RegionInfo.RegionID);
             }
@@ -89,9 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 scene.UnregisterModuleInterface<IPresenceService>(this);
                 scene.UnregisterModuleInterface<IGridUserService>(this);
 
-                scene.EventManager.OnMakeRootAgent -= MakeRootAgentHandler;
-                scene.EventManager.OnNewClient -= NewClientHandler;
-                scene.EventManager.OnSignificantClientMovement -= SignificantClientMovementHandler;
+                m_activityDetector.RemoveRegion(scene);
 
                 LogoutRegionAgents(scene.RegionInfo.RegionID);
             }
@@ -193,29 +190,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
         {
-            return ReportAgent(sessionID, regionID, Vector3.Zero, Vector3.Zero);
-        }
-
-        protected bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
-        {
-            //m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "UpdateSession" },
-                { "SessionID", sessionID.ToString() },
-                { "SceneID", regionID.ToString() },
-                { "ScenePosition", position.ToString() },
-                { "SceneLookAt", lookAt.ToString() }
-            };
-
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
-            bool success = response["Success"].AsBoolean();
-
-            if (!success)
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString());
-
-            return success;
+            // Not needed for SimianGrid
+            return true;
         }
 
         public PresenceInfo GetAgent(UUID sessionID)
@@ -274,14 +250,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public GridUserInfo LoggedIn(string userID)
         {
-            // never implemented at the sim
+            // Never implemented at the sim
             return null;
         }
 
         public bool LoggedOut(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-            // Not needed for simian grid, event handler is doing it
-            return true;
+            // Save our last position as user data
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "AddUserData" },
+                { "UserID", userID.ToString() },
+                { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            bool success = response["Success"].AsBoolean();
+
+            if (!success)
+                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString());
+
+            return success;
         }
 
         public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
@@ -304,10 +293,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
+        public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
+        {
+            return UpdateSession(sessionID, regionID, lastPosition, lastLookAt);
+        }
+
         public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-            // Not needed for simian grid, presence detection is doing it
-            return true;
+            // Never called
+            return false;
         }
 
         public GridUserInfo GetGridUserInfo(string user)
@@ -334,54 +328,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         #endregion
 
-        #region Presence Detection
-
-        private void MakeRootAgentHandler(ScenePresence sp)
-        {
-            m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
-
-            ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            SetLastLocation(sp.UUID, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-        }
-
-        private void NewClientHandler(IClientAPI client)
-        {
-            client.OnConnectionClosed += LogoutHandler;
-        }
-
-        private void SignificantClientMovementHandler(IClientAPI client)
-        {
-            ScenePresence sp;
-            if (client.Scene is Scene && ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out sp))
-                ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-        }
-
-        private void LogoutHandler(IClientAPI client)
-        {
-            if (client.IsLoggingOut)
-            {
-                client.OnConnectionClosed -= LogoutHandler;
-
-                object obj;
-                if (client.Scene.TryGetScenePresence(client.AgentId, out obj) && obj is ScenePresence)
-                {
-                    // The avatar is still in the scene, we can get the exact logout position
-                    ScenePresence sp = (ScenePresence)obj;
-                    SetLastLocation(client.AgentId, client.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-                }
-                else
-                {
-                    // The avatar was already removed from the scene, store LastLocation using the most recent session data
-                    m_log.Warn("[PRESENCE]: " + client.Name + " has already been removed from the scene, storing approximate LastLocation");
-                    SetLastLocation(client.SessionId);
-                }
-
-                LogoutAgent(client.SessionId);
-            }
-        }
-
-        #endregion Presence Detection
-
         #region Helpers
 
         private OSDMap GetUserData(UUID userID)
@@ -453,57 +399,60 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return presences;
         }
 
-        /// <summary>
-        /// Fetch the last known avatar location with GetSession and persist it
-        /// as user data with AddUserData
-        /// </summary>
-        private bool SetLastLocation(UUID sessionID)
+        private bool UpdateSession(UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
+            // Save our current location as session data
             NameValueCollection requestArgs = new NameValueCollection
             {
-                { "RequestMethod", "GetSession" },
-                { "SessionID", sessionID.ToString() }
+                { "RequestMethod", "UpdateSession" },
+                { "SessionID", sessionID.ToString() },
+                { "SceneID", regionID.ToString() },
+                { "ScenePosition", lastPosition.ToString() },
+                { "SceneLookAt", lastLookAt.ToString() }
             };
 
             OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
-            if (success)
-            {
-                UUID userID = response["UserID"].AsUUID();
-                UUID sceneID = response["SceneID"].AsUUID();
-                Vector3 position = response["ScenePosition"].AsVector3();
-                Vector3 lookAt = response["SceneLookAt"].AsVector3();
-
-                return SetLastLocation(userID, sceneID, position, lookAt);
-            }
-            else
-            {
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID +
-                    " while saving last location: " + response["Message"].AsString());
-            }
-
-            return success;
-        }
-
-        private bool SetLastLocation(UUID userID, UUID sceneID, Vector3 position, Vector3 lookAt)
-        {
-            NameValueCollection requestArgs = new NameValueCollection
-                {
-                    { "RequestMethod", "AddUserData" },
-                    { "UserID", userID.ToString() },
-                    { "LastLocation", SerializeLocation(sceneID, position, lookAt) }
-                };
-
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
-            bool success = response["Success"].AsBoolean();
-
             if (!success)
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString());
+                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString());
 
             return success;
         }
 
+        ///// <summary>
+        ///// Fetch the last known avatar location with GetSession and persist it
+        ///// as user data with AddUserData
+        ///// </summary>
+        //private bool SetLastLocation(UUID sessionID)
+        //{
+        //    NameValueCollection requestArgs = new NameValueCollection
+        //    {
+        //        { "RequestMethod", "GetSession" },
+        //        { "SessionID", sessionID.ToString() }
+        //    };
+
+        //    OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+        //    bool success = response["Success"].AsBoolean();
+
+        //    if (success)
+        //    {
+        //        UUID userID = response["UserID"].AsUUID();
+        //        UUID sceneID = response["SceneID"].AsUUID();
+        //        Vector3 position = response["ScenePosition"].AsVector3();
+        //        Vector3 lookAt = response["SceneLookAt"].AsVector3();
+
+        //        return SetLastLocation(userID, sceneID, position, lookAt);
+        //    }
+        //    else
+        //    {
+        //        m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID +
+        //            " while saving last location: " + response["Message"].AsString());
+        //    }
+
+        //    return success;
+        //}
+
         private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse, OSDMap userResponse)
         {
             if (sessionResponse == null)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 815816a..c059969 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -621,14 +621,6 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendAvatarData(SendAvatarData data)
-        {
-        }
-
-        public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
-        {
-        }
-
         public virtual void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
         {
         }
@@ -641,15 +633,15 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendPrimitiveToClient(SendPrimitiveData data)
+        public void SendAvatarDataImmediate(ISceneEntity avatar)
         {
         }
 
-        public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
+        public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
         }
 
-        public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
         {
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index be28c27..159764c 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -85,5 +85,9 @@ namespace OpenSim.Tests.Common.Mock
         public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {}
         public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {}
         public void SetParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime) {}
+
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id) {}
+
     }
 }
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
index a94dd3d..7aa95ec 100644
--- a/bin/MySql.Data.dll
+++ b/bin/MySql.Data.dll
diff --git a/prebuild.xml b/prebuild.xml
index b960553..2706c8e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2171,6 +2171,7 @@
           <Exclude name="Tests" pattern="Tests" />
         </Match>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
@@ -2204,6 +2205,7 @@
       <Files>
         <Match pattern="*.cs" recurse="true"/>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
@@ -2241,6 +2243,7 @@
           <Exclude name="Tests" pattern="Tests" />
         </Match>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
@@ -2277,6 +2280,7 @@
           <Exclude name="Tests" pattern="Tests" />
         </Match>
         <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
+        <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>