117 files changed, 4042 insertions, 9825 deletions

diff --git a/OpenSim/Data/DataPluginFactory.cs b/OpenSim/Data/DataPluginFactory.cs
deleted file mode 100644
index 841f71e..0000000
--- a/OpenSim/Data/DataPluginFactory.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// A static class containing methods for obtaining handles to database
-    /// storage objects.
-    /// </summary>
-    public static class DataPluginFactory
-    {
-        /// <summary>
-        /// Based on <typeparam name="T" />, returns the appropriate
-        /// PluginInitialiserBase instance in <paramref name="init" /> and
-        /// extension point path in <paramref name="path" />.
-        /// </summary>
-        /// <param name="connect">
-        /// The DB connection string used when creating a new
-        /// PluginInitialiserBase, returned in <paramref name="init" />.
-        /// </param>
-        /// <param name="init">
-        /// A reference to a PluginInitialiserBase object in which the proper
-        /// initialiser will be returned.
-        /// </param>
-        /// <param name="path">
-        /// A string in which the proper extension point path will be returned.
-        /// </param>
-        /// <typeparam name="T">
-        /// The type of data plugin requested.
-        /// </typeparam>
-        /// <exception cref="NotImplementedException">
-        /// Thrown if <typeparamref name="T" /> is not one of the expected data
-        /// interfaces.
-        /// </exception>
-        private static void PluginLoaderParamFactory<T>(string connect, out PluginInitialiserBase init, out string path) where T : IPlugin
-        {
-            Type type = typeof(T);
-
-            if (type == typeof(IInventoryDataPlugin))
-            {
-                init = new InventoryDataInitialiser(connect);
-                path = "/OpenSim/InventoryData";
-            }
-            else if (type == typeof(IUserDataPlugin))
-            {
-                init = new UserDataInitialiser(connect);
-                path = "/OpenSim/UserData";
-            }
-            else if (type == typeof(IGridDataPlugin))
-            {
-                init = new GridDataInitialiser(connect);
-                path = "/OpenSim/GridData";
-            }
-            else if (type == typeof(ILogDataPlugin))
-            {
-                init = new LogDataInitialiser(connect);
-                path = "/OpenSim/LogData";
-            }
-            else if (type == typeof(IAssetDataPlugin))
-            {
-                init = new AssetDataInitialiser(connect);
-                path = "/OpenSim/AssetData";
-            }
-            else
-            {
-                // We don't support this data plugin.
-                throw new NotImplementedException(String.Format("The type '{0}' is not a valid data plugin.", type));
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of new <typeparamref name="T" /> data plugins.
-        /// Plugins will be requested in the order they were added.
-        /// </summary>
-        /// <param name="provider">
-        /// The filename of the inventory server plugin DLL.
-        /// </param>
-        /// <param name="connect">
-        /// The connection string for the storage backend.
-        /// </param>
-        /// <typeparam name="T">
-        /// The type of data plugin requested.
-        /// </typeparam>
-        /// <returns>
-        /// A list of all loaded plugins matching <typeparamref name="T" />.
-        /// </returns>
-        public static List<T> LoadDataPlugins<T>(string provider, string connect) where T : IPlugin
-        {
-            PluginInitialiserBase pluginInitialiser;
-            string extensionPointPath;
-
-            PluginLoaderParamFactory<T>(connect, out pluginInitialiser, out extensionPointPath);
-
-            using (PluginLoader<T> loader = new PluginLoader<T>(pluginInitialiser))
-            {
-                // loader will try to load all providers (MySQL, MSSQL, etc)
-                // unless it is constrainted to the correct "Provider" entry in the addin.xml
-                loader.Add(extensionPointPath, new PluginProviderFilter(provider));
-                loader.Load();
-
-                return loader.Plugins;
-            }
-        }
-
-        /// <summary>
-        /// Returns a new <typeparamref name="T" /> data plugin instance if
-        /// only one was loaded, otherwise returns null (<c>default(T)</c>).
-        /// </summary>
-        /// <param name="provider">
-        /// The filename of the inventory server plugin DLL.
-        /// </param>
-        /// <param name="connect">
-        /// The connection string for the storage backend.
-        /// </param>
-        /// <typeparam name="T">
-        /// The type of data plugin requested.
-        /// </typeparam>
-        /// <returns>
-        /// A list of all loaded plugins matching <typeparamref name="T" />.
-        /// </returns>
-        public static T LoadDataPlugin<T>(string provider, string connect) where T : IPlugin
-        {
-            List<T> plugins = LoadDataPlugins<T>(provider, connect);
-            return (plugins.Count == 1) ? plugins[0] : default(T);
-        }
-    }
-}
diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/IAvatarData.cs
index 3956fe6..0a18e21 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -26,23 +26,24 @@
  */
 
 using System;
+using System.Collections.Generic;
 using OpenMetaverse;
+using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
-    public class ReservationData
+    // This MUST be a ref type!
+    public class AvatarBaseData
     {
-        public UUID userUUID = UUID.Zero;
-        public int reservationMinX = 0;
-        public int reservationMinY = 0;
-        public int reservationMaxX = 65536;
-        public int reservationMaxY = 65536;
-
-        public string reservationName = String.Empty;
-        public string reservationCompany = String.Empty;
-        public bool status = true;
+        public UUID PrincipalID;
+        public Dictionary<string, string> Data;
+    }
 
-        public string gridSendKey = String.Empty;
-        public string gridRecvKey = String.Empty;
+    public interface IAvatarData 
+    {
+        AvatarBaseData[] Get(string field, string val);
+        bool Store(AvatarBaseData data);
+        bool Delete(UUID principalID, string name);
+        bool Delete(string field, string val);
     }
 }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/IFriendsData.cs
index c9953c5..1f1a031 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/IFriendsData.cs
@@ -25,40 +25,27 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.IO;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using OpenSim.Tests.Common;
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.Data.SQLite.Tests
+namespace OpenSim.Data
 {
-    [TestFixture, DatabaseTest]
-    public class SQLiteUserTest : BasicUserTest
+    public class FriendsData
     {
-        public string file;
-        public string connect;
-        
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            // SQLite doesn't work on power or z linux
-            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
-            {
-                Assert.Ignore();
-            }
-
-            SuperInit();
-            file = Path.GetTempFileName() + ".db";
-            connect = "URI=file:" + file + ",version=3";
-            db = new SQLiteUserData();
-            db.Initialise(connect);
-        }
+        public UUID PrincipalID;
+        public string Friend;
+        public Dictionary<string, string> Data;
+    }
 
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            db.Dispose();
-            File.Delete(file);
-        }
+    /// <summary>
+    /// An interface for connecting to the friends datastore
+    /// </summary>
+    public interface IFriendsData
+    {
+        bool Store(FriendsData data);
+        bool Delete(UUID ownerID, string friend);
+        FriendsData[] GetFriends(UUID principalID);
     }
 }
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
deleted file mode 100644
index 8bd3811..0000000
--- a/OpenSim/Data/IGridData.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    public enum DataResponse
-    {
-        RESPONSE_OK,
-        RESPONSE_AUTHREQUIRED,
-        RESPONSE_INVALIDCREDENTIALS,
-        RESPONSE_ERROR
-    }
-
-    /// <summary>
-    /// A standard grid interface
-    /// </summary>
-    public interface IGridDataPlugin : IPlugin
-    {
-        /// <summary>
-        /// Initialises the interface
-        /// </summary>
-        void Initialise(string connect);
-
-        /// <summary>
-        /// Returns a sim profile from a regionHandle
-        /// </summary>
-        /// <param name="regionHandle">A 64bit Region Handle</param>
-        /// <returns>A simprofile</returns>
-        RegionProfileData GetProfileByHandle(ulong regionHandle);
-
-        /// <summary>
-        /// Returns a sim profile from a UUID
-        /// </summary>
-        /// <param name="UUID">A 128bit UUID</param>
-        /// <returns>A sim profile</returns>
-        RegionProfileData GetProfileByUUID(UUID UUID);
-
-        /// <summary>
-        /// Returns a sim profile from a string match
-        /// </summary>
-        /// <param name="regionName">A string for a partial region name match</param>
-        /// <returns>A sim profile</returns>
-        RegionProfileData GetProfileByString(string regionName);
-
-        /// <summary>
-        /// Returns all profiles within the specified range
-        /// </summary>
-        /// <param name="Xmin">Minimum sim coordinate (X)</param>
-        /// <param name="Ymin">Minimum sim coordinate (Y)</param>
-        /// <param name="Xmax">Maximum sim coordinate (X)</param>
-        /// <param name="Ymin">Maximum sim coordinate (Y)</param>
-        /// <returns>An array containing all the sim profiles in the specified range</returns>
-        RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
-
-        /// <summary>
-        /// Returns up to maxNum profiles of regions that have a name starting with namePrefix
-        /// </summary>
-        /// <param name="name">The name to match against</param>
-        /// <param name="maxNum">Maximum number of profiles to return</param>
-        /// <returns>A list of sim profiles</returns>
-        List<RegionProfileData> GetRegionsByName(string namePrefix, uint maxNum);
-        
-        /// <summary>
-        /// Authenticates a sim by use of its recv key.
-        /// WARNING: Insecure
-        /// </summary>
-        /// <param name="UUID">The UUID sent by the sim</param>
-        /// <param name="regionHandle">The regionhandle sent by the sim</param>
-        /// <param name="simrecvkey">The receiving key sent by the sim</param>
-        /// <returns>Whether the sim has been authenticated</returns>
-        bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
-
-        /// <summary>
-        /// Adds or updates a profile in the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>RESPONSE_OK if successful, error if not.</returns>
-        DataResponse StoreProfile(RegionProfileData profile);
-
-        /// <summary>
-        /// Remove a profile from the database
-        /// </summary>
-        /// <param name="UUID">ID of profile to remove</param>
-        /// <returns></returns>
-        DataResponse DeleteProfile(string UUID);
-
-        /// <summary>
-        /// Function not used????
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        ReservationData GetReservationAtPoint(uint x, uint y);
-    }
-
-    public class GridDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public GridDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
-        {
-            IGridDataPlugin p = plugin as IGridDataPlugin;
-            p.Initialise (connect);
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/MySQLSuperManager.cs b/OpenSim/Data/IGridUserData.cs
index c579432..bd7a435 100644
--- a/OpenSim/Data/MySQL/MySQLSuperManager.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -25,28 +25,26 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Threading;
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
 
-namespace OpenSim.Data.MySQL
+namespace OpenSim.Data
 {
-    public class MySQLSuperManager
+    // This MUST be a ref type!
+    public class GridUserData
     {
-        public bool Locked;
-        private readonly Mutex m_lock = new Mutex(false);
-        public MySQLManager Manager;
-        public string Running;
-
-        public void GetLock()
-        {
-            Locked = true;
-            m_lock.WaitOne();
-        }
-
-        public void Release()
-        {
-            m_lock.ReleaseMutex();
-            Locked = false;
-        }
+        public string UserID;
+        public Dictionary<string, string> Data;
+    }
 
+    /// <summary>
+    /// An interface for connecting to the user grid datastore
+    /// </summary>
+    public interface IGridUserData 
+    {
+        GridUserData GetGridUserData(string userID);
+        bool StoreGridUserData(GridUserData data);
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index e5a8ebd..71d0e31 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -32,25 +32,28 @@ using OpenSim.Framework;
 
 namespace OpenSim.Data
 {
-    public struct PresenceData
+    // This MUST be a ref type!
+    public class PresenceData
     {
-        public UUID UUID;
-        public UUID currentRegion;
+        public string UserID;
+        public UUID RegionID;
+        public UUID SessionID;
         public Dictionary<string, string> Data;
     }
 
     /// <summary>
-    /// An interface for connecting to the authentication datastore
+    /// An interface for connecting to the presence datastore
     /// </summary>
     public interface IPresenceData 
     {
         bool Store(PresenceData data);
 
-        PresenceData Get(UUID principalID);
-
-        bool SetUserDataItem(UUID principalID, string item, string value);
-        bool SetRegionDataItem(UUID principalID, string item, string value);
-
-        bool Delete(UUID regionID);
+        PresenceData Get(UUID sessionID);
+        void LogoutRegionAgents(UUID regionID);
+        bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt);
+        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        PresenceData[] Get(string field, string data);
+        void Prune(string userID);
+        bool Delete(string field, string val);
     }
 }
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 7a607ab..8259f9b 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -60,5 +60,22 @@ namespace OpenSim.Data
 
         bool Delete(UUID regionID);
 
+        List<RegionData> GetDefaultRegions(UUID scopeID);
+        List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y);
+    }
+
+    [Flags]
+    public enum RegionFlags : int
+    {
+        DefaultRegion = 1, // Used for new Rez. Random if multiple defined
+        FallbackRegion = 2, // Regions we redirect to when the destination is down
+        RegionOnline = 4, // Set when a region comes online, unset when it unregisters and DeleteOnUnregister is false
+        NoDirectLogin = 8, // Region unavailable for direct logins (by name)
+        Persistent = 16, // Don't remove on unregister
+        LockedOut = 32, // Don't allow registration
+        NoMove = 64, // Don't allow moving this region
+        Reservation = 128, // This is an inactive reservation
+        Authenticate = 256, // Require authentication
+        Hyperlink = 512 // Record represents a HG link
     }
 }
diff --git a/OpenSim/Data/IRegionProfileService.cs b/OpenSim/Data/IRegionProfileService.cs
deleted file mode 100644
index b3acc52..0000000
--- a/OpenSim/Data/IRegionProfileService.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Data
-{
-    public interface IRegionProfileService
-    {
-        /// <summary>
-        /// Returns a region by argument
-        /// </summary>
-        /// <param name="uuid">A UUID key of the region to return</param>
-        /// <returns>A SimProfileData for the region</returns>
-        RegionProfileData GetRegion(UUID uuid);
-
-        /// <summary>
-        /// Returns a region by argument
-        /// </summary>
-        /// <param name="uuid">A regionHandle of the region to return</param>
-        /// <returns>A SimProfileData for the region</returns>
-        RegionProfileData GetRegion(ulong handle);
-
-        /// <summary>
-        /// Returns a region by argument
-        /// </summary>
-        /// <param name="regionName">A partial regionName of the region to return</param>
-        /// <returns>A SimProfileData for the region</returns>
-        RegionProfileData GetRegion(string regionName);
-
-        List<RegionProfileData> GetRegions(uint xmin, uint ymin, uint xmax, uint ymax);
-        List<RegionProfileData> GetRegions(string name, int maxNum);
-        DataResponse AddUpdateRegion(RegionProfileData sim, RegionProfileData existingSim);
-        DataResponse DeleteRegion(string uuid);
-    }
-
-    public interface IRegionProfileRouter
-    {
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region UUID
-        /// </summary>
-        /// <param name="regionId">The region UUID to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        /// <remarks>This method should be statics</remarks>
-        RegionProfileData RequestSimProfileData(UUID regionId, Uri gridserverUrl,
-                                                       string gridserverSendkey, string gridserverRecvkey);
-
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region Handle
-        /// </summary>
-        /// <param name="regionHandle">the region handle to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        RegionProfileData RequestSimProfileData(ulong regionHandle, Uri gridserverUrl,
-                                                       string gridserverSendkey, string gridserverRecvkey);
-
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region Name
-        /// </summary>
-        /// <param name="regionName">the region name to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
-                                                       string gridserverSendkey, string gridserverRecvkey);
-    }
-}
diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 6bec188..906ba6c 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -36,20 +36,19 @@ namespace OpenSim.Data
     {
         public UUID PrincipalID;
         public UUID ScopeID;
-        public Dictionary<string, object> Data;
+        public string FirstName;
+        public string LastName;
+        public Dictionary<string, string> Data;
     }
 
     /// <summary>
-    /// An interface for connecting to the authentication datastore
+    /// An interface for connecting to the user accounts datastore
     /// </summary>
     public interface IUserAccountData
     {
-        UserAccountData Get(UUID principalID, UUID ScopeID);
-
-        List<UserAccountData> Query(UUID principalID, UUID ScopeID, string query);
-
+        UserAccountData[] Get(string[] fields, string[] values);
         bool Store(UserAccountData data);
-
-        bool SetDataItem(UUID principalID, string item, string value);
+        bool Delete(string field, string val);
+        UserAccountData[] GetUsers(UUID scopeID, string query);
     }
 }
diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs
deleted file mode 100644
index e9a1e81..0000000
--- a/OpenSim/Data/IUserData.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// An interface for connecting to user storage servers.
-    /// </summary>
-    public interface IUserDataPlugin : IPlugin
-    {
-        /// <summary>
-        /// Returns a user profile from a database via their UUID
-        /// </summary>
-        /// <param name="user">The user's UUID</param>
-        /// <returns>The user data profile.  Returns null if no user is found</returns>
-        UserProfileData GetUserByUUID(UUID user);
-
-        /// <summary>
-        /// Returns a users profile by searching their username parts
-        /// </summary>
-        /// <param name="fname">Account firstname</param>
-        /// <param name="lname">Account lastname</param>
-        /// <returns>The user data profile.  Null if no user is found</returns>
-        UserProfileData GetUserByName(string fname, string lname);
-        
-        /// <summary>
-        /// Get a user from a given uri.
-        /// </summary>
-        /// <param name="uri"></param>
-        /// <returns>The user data profile.  Null if no user is found.</returns>
-        UserProfileData GetUserByUri(Uri uri);
-
-        /// <summary>
-        /// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker.
-        /// </summary>
-        /// <param name="queryID">ID associated with the user's query. This must match what the client sent</param>
-        /// <param name="query">The filtered contents of the search box when the user hit search.</param>
-        /// <returns>A list of user details.  If there are no results than either an empty list or null</returns>
-        List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query);
-
-        /// <summary>
-        /// Returns the current agent for a user searching by it's UUID
-        /// </summary>
-        /// <param name="user">The users UUID</param>
-        /// <returns>The current agent session.  Null if no session was found</returns>
-        UserAgentData GetAgentByUUID(UUID user);
-
-        /// <summary>
-        /// Returns the current session agent for a user searching by username
-        /// </summary>
-        /// <param name="name">The users account name</param>
-        /// <returns>The current agent session</returns>
-        UserAgentData GetAgentByName(string name);
-
-        /// <summary>
-        /// Returns the current session agent for a user searching by username parts
-        /// </summary>
-        /// <param name="fname">The users first account name</param>
-        /// <param name="lname">The users account surname</param>
-        /// <returns>The current agent session</returns>
-        UserAgentData GetAgentByName(string fname, string lname);
-
-        /// <summary>
-        /// Stores new web-login key for user during web page login
-        /// </summary>
-        /// <param name="webLoginKey"></param>
-        void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
-
-        /// <summary>
-        /// Adds a new User profile to the database
-        /// </summary>
-        /// <param name="user">UserProfile to add</param>
-        void AddNewUserProfile(UserProfileData user);
-
-        /// <summary>
-        /// Adds a temporary user profile.  A temporary userprofile is one that should exist only for the lifetime of
-        /// the process.
-        /// </summary>
-        /// <param name="userProfile"></param>
-        void AddTemporaryUserProfile(UserProfileData userProfile);
-
-        /// <summary>
-        /// Updates an existing user profile
-        /// </summary>
-        /// <param name="user">UserProfile to update</param>
-        bool UpdateUserProfile(UserProfileData user);
-
-        /// <summary>
-        /// Adds a new agent to the database
-        /// </summary>
-        /// <param name="agent">The agent to add</param>
-        void AddNewUserAgent(UserAgentData agent);
-
-        /// <summary>
-        /// Adds a new friend to the database for XUser
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
-        /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
-        /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
-
-        /// <summary>
-        /// Delete friend on friendlistowner's friendlist.
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
-        /// <param name="friend">The Ex-friend agent</param>
-        void RemoveUserFriend(UUID friendlistowner, UUID friend);
-
-        /// <summary>
-        /// Update permissions for friend on friendlistowner's friendlist.
-        /// </summary>
-        /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
-        /// <param name="friend">The agent that is getting or loosing permissions</param>
-        /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
-        void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
-
-        /// <summary>
-        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
-        /// </summary>
-        /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
-        /// <returns>The user's friends.  If there are no results than either an empty list or null</returns>
-        List<FriendListItem> GetUserFriendList(UUID friendlistowner);
-
-        /// <summary>
-        /// Returns a list of <see cref="FriendRegionInfo/>s for the specified UUIDs.
-        /// </summary>
-        /// <param name="uuids">
-        /// A <see cref="List"/> of <see cref="UUID/>s to fetch info for
-        /// </param>
-        /// <returns>
-        /// A <see cref="Dictionary"/>, mapping the <see cref="UUID"/>s to <see cref="FriendRegionInfo"/>s.
-        /// </returns>
-        Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids);
-
-        /// <summary>
-        /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
-        /// </summary>
-        /// <param name="from">The account to transfer from</param>
-        /// <param name="to">The account to transfer to</param>
-        /// <param name="amount">The amount to transfer</param>
-        /// <returns>Successful?</returns>
-        bool MoneyTransferRequest(UUID from, UUID to, uint amount);
-
-        /// <summary>
-        /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account.
-        /// </summary>
-        /// <param name="from">User to transfer from</param>
-        /// <param name="to">User to transfer to</param>
-        /// <param name="inventory">Specified inventory item</param>
-        /// <returns>Successful?</returns>
-        bool InventoryTransferRequest(UUID from, UUID to, UUID inventory);
-
-        /// <summary>
-        /// Initialises the plugin (artificial constructor)
-        /// </summary>
-        void Initialise(string connect);
-
-        /// <summary>
-        /// Gets the user appearance
-        /// </summer>
-        AvatarAppearance GetUserAppearance(UUID user);
-
-        void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
-
-        void ResetAttachments(UUID userID);
-
-        void LogoutUsers(UUID regionID);
-    }
-
-    public class UserDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public UserDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
-        {
-            IUserDataPlugin p = plugin as IUserDataPlugin;
-            p.Initialise (connect);
-        }
-    }
-}
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
index cd9273e..6909136 100644
--- a/OpenSim/Data/IXInventoryData.cs
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Data
         public int saleType;
         public int creationDate;
         public UUID groupID;
-        public bool groupOwned;
+        public int groupOwned;
         public int flags;
         public UUID inventoryID;
         public UUID avatarID;
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
deleted file mode 100644
index 93e48cd..0000000
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Data;
-using System.Data.SqlClient;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// Encapsulates a SqlCommand object but ensures that when it is disposed, its connection is closed and disposed also.
-    /// </summary>
-    internal class AutoClosingSqlCommand : IDbCommand
-    {
-        private SqlCommand realCommand;
-
-        public AutoClosingSqlCommand(SqlCommand cmd)
-        {
-            realCommand = cmd;
-        }
-
-        #region IDbCommand Members
-
-        public void Cancel()
-        {
-            realCommand.Cancel();
-        }
-
-        public string CommandText
-        {
-            get
-            {
-                return realCommand.CommandText;
-            }
-            set
-            {
-                realCommand.CommandText = value;
-            }
-        }
-
-        public int CommandTimeout
-        {
-            get
-            {
-                return realCommand.CommandTimeout;
-            }
-            set
-            {
-                realCommand.CommandTimeout = value;
-            }
-        }
-
-        public CommandType CommandType
-        {
-            get
-            {
-                return realCommand.CommandType;
-            }
-            set
-            {
-                realCommand.CommandType = value;
-            }
-        }
-
-        IDbConnection IDbCommand.Connection
-        {
-            get
-            {
-                return realCommand.Connection;
-            }
-            set
-            {
-                realCommand.Connection = (SqlConnection) value;
-            }
-        }
-
-        public SqlConnection Connection
-        {
-            get
-            {
-                return realCommand.Connection;
-            }
-        }
-
-        IDbDataParameter IDbCommand.CreateParameter()
-        {
-            return realCommand.CreateParameter();
-        }
-
-        public SqlParameter CreateParameter()
-        {
-            return realCommand.CreateParameter();
-        }
-
-        public int ExecuteNonQuery()
-        {
-            return realCommand.ExecuteNonQuery();
-        }
-
-        IDataReader IDbCommand.ExecuteReader(CommandBehavior behavior)
-        {
-            return realCommand.ExecuteReader(behavior);
-        }
-
-        public SqlDataReader ExecuteReader(CommandBehavior behavior)
-        {
-            return realCommand.ExecuteReader(behavior);
-        }
-
-        IDataReader IDbCommand.ExecuteReader()
-        {
-            return realCommand.ExecuteReader();
-        }
-
-        public SqlDataReader ExecuteReader()
-        {
-            return realCommand.ExecuteReader();
-        }
-
-        public object ExecuteScalar()
-        {
-            return realCommand.ExecuteScalar();
-        }
-
-        IDataParameterCollection IDbCommand.Parameters
-        {
-            get { return realCommand.Parameters; }
-        }
-
-        public SqlParameterCollection Parameters
-        {
-            get { return realCommand.Parameters; }
-        }
-
-        public void Prepare()
-        {
-            realCommand.Prepare();
-        }
-
-//        IDbTransaction IDbCommand.Transaction
-//        {
-//            get
-//            {
-//                return realCommand.Transaction;
-//            }
-//            set
-//            {
-//                realCommand.Transaction = (SqlTransaction) value;
-//            }
-//        }
-
-        public IDbTransaction Transaction
-        {
-            get { return realCommand.Transaction; }
-            set { realCommand.Transaction = (SqlTransaction)value; }
-        }
-
-        UpdateRowSource IDbCommand.UpdatedRowSource
-        {
-            get
-            {
-                return realCommand.UpdatedRowSource;
-            }
-            set
-            {
-                realCommand.UpdatedRowSource = value;
-            }
-        }
-
-        #endregion
-
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            SqlConnection conn = realCommand.Connection;
-            try
-            {
-                realCommand.Dispose();
-            }
-            finally
-            {
-                try
-                {
-                    conn.Close();
-                }
-                finally
-                {
-                    conn.Dispose();
-                }
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 1ce4abf..d6ea262 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Data.MSSQL
         /// Database manager
         /// </summary>
         private MSSQLManager m_database;
+        private string m_connectionString;
 
         #region IPlugin Members
 
@@ -75,23 +76,8 @@ namespace OpenSim.Data.MSSQL
         {
             m_ticksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
 
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                m_database = new MSSQLManager(connectionString);
-            }
-            else
-            {
-                IniFile gridDataMSSqlFile = new IniFile("mssql_connection.ini");
-                string settingDataSource = gridDataMSSqlFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = gridDataMSSqlFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = gridDataMSSqlFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = gridDataMSSqlFile.ParseFileReadValue("user_id");
-                string settingPassword = gridDataMSSqlFile.ParseFileReadValue("password");
-
-                m_database =
-                    new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                     settingPassword);
-            }
+            m_database = new MSSQLManager(connectionString);
+            m_connectionString = connectionString;
 
             //New migration to check for DB changes
             m_database.CheckMigration(_migrationStore);
@@ -125,17 +111,20 @@ namespace OpenSim.Data.MSSQL
         override public AssetBase GetAsset(UUID assetID)
         {
             string sql = "SELECT * FROM assets WHERE id = @id";
-            using (AutoClosingSqlCommand command = m_database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(m_database.CreateParameter("id", assetID));
-                using (SqlDataReader reader = command.ExecuteReader())
+                cmd.Parameters.Add(m_database.CreateParameter("id", assetID));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
                         AssetBase asset = new AssetBase(
                             new UUID((Guid)reader["id"]),
                             (string)reader["name"],
-                            Convert.ToSByte(reader["assetType"])
+                            Convert.ToSByte(reader["assetType"]),
+                            String.Empty
                         );
                         // Region Main
                         asset.Description = (string)reader["description"];
@@ -190,7 +179,8 @@ namespace OpenSim.Data.MSSQL
                 m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
             }
             
-            using (AutoClosingSqlCommand command = m_database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 int now = (int)((System.DateTime.Now.Ticks - m_ticksToEpoch) / 10000000);
                 command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
@@ -202,7 +192,7 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(m_database.CreateParameter("access_time", now));
                 command.Parameters.Add(m_database.CreateParameter("create_time", now));
                 command.Parameters.Add(m_database.CreateParameter("data", asset.Data));
-
+                conn.Open();
                 try
                 {
                     command.ExecuteNonQuery();
@@ -238,7 +228,8 @@ namespace OpenSim.Data.MSSQL
                 m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on update");
             }
             
-            using (AutoClosingSqlCommand command = m_database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 command.Parameters.Add(m_database.CreateParameter("id", asset.FullID));
                 command.Parameters.Add(m_database.CreateParameter("name", assetName));
@@ -248,7 +239,7 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(m_database.CreateParameter("temporary", asset.Temporary));
                 command.Parameters.Add(m_database.CreateParameter("data", asset.Data));
                 command.Parameters.Add(m_database.CreateParameter("@keyId", asset.FullID));
-
+                conn.Open();
                 try
                 {
                     command.ExecuteNonQuery();
@@ -307,13 +298,14 @@ namespace OpenSim.Data.MSSQL
             string sql = @"SELECT (name,description,assetType,temporary,id), Row = ROW_NUMBER() 
                             OVER (ORDER BY (some column to order by)) 
                             WHERE Row >= @Start AND Row < @Start + @Count";
-            
-            using (AutoClosingSqlCommand command = m_database.Query(sql))
-            {
-                command.Parameters.Add(m_database.CreateParameter("start", start));
-                command.Parameters.Add(m_database.CreateParameter("count", count));
 
-                using (SqlDataReader reader = command.ExecuteReader())
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("start", start));
+                cmd.Parameters.Add(m_database.CreateParameter("count", count));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
index 801610a..1ae78c4 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Data.MSSQL
             {
                 conn.Open();
                 Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
+                m_database = new MSSQLManager(m_ConnectionString);
                 m.Update();
             }
         }
@@ -168,13 +169,14 @@ namespace OpenSim.Data.MSSQL
         {
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
-            string sql = "insert into tokens (UUID, token, validity) values (@principalID, @token, date_add(now(), interval @lifetime minute))";
+            
+            string sql = "insert into tokens (UUID, token, validity) values (@principalID, @token, @lifetime)";
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
                 cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", lifetime));
+                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", DateTime.Now.AddMinutes(lifetime)));
                 conn.Open();
 
                 if (cmd.ExecuteNonQuery() > 0)
@@ -189,13 +191,15 @@ namespace OpenSim.Data.MSSQL
         {
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
-            string sql = "update tokens set validity = date_add(now(), interval @lifetime minute) where UUID = @principalID and token = @token and validity > now()";
+
+            DateTime validDate = DateTime.Now.AddMinutes(lifetime);
+            string sql = "update tokens set validity = @validDate where UUID = @principalID and token = @token and validity > GetDate()";
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
                 cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", lifetime));
+                cmd.Parameters.Add(m_database.CreateParameter("@validDate", validDate));
                 conn.Open();
 
                 if (cmd.ExecuteNonQuery() > 0)
@@ -208,11 +212,13 @@ namespace OpenSim.Data.MSSQL
 
         private void DoExpire()
         {
-            string sql = "delete from tokens where validity < now()";
+            DateTime currentDateTime = DateTime.Now;
+            string sql = "delete from tokens where validity < @currentDateTime";
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 conn.Open();
+                cmd.Parameters.Add(m_database.CreateParameter("@currentDateTime", currentDateTime));
                 cmd.ExecuteNonQuery();
             }
             m_LastExpire = System.Environment.TickCount;
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
new file mode 100644
index 0000000..49a6b09
--- /dev/null
+++ b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Data.SqlClient;
+
+namespace OpenSim.Data.MSSQL
+{
+    /// <summary>
+    /// A MSSQL Interface for Avatar Storage
+    /// </summary>
+    public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>,
+            IAvatarData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public MSSQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+        {
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format("DELETE FROM {0} where [PrincipalID] = @PrincipalID and [Name] = @Name", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@Name", name));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                    return true;
+
+                return false;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index c0c6349..474f706 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Data.MSSQL
         private static readonly ILog _Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private MSSQLManager _Database;
-
+        private string m_connectionString;
         private FieldInfo[] _Fields;
         private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
 
@@ -58,22 +58,9 @@ namespace OpenSim.Data.MSSQL
         {
             if (!string.IsNullOrEmpty(connectionString))
             {
+                m_connectionString = connectionString;
                 _Database = new MSSQLManager(connectionString);
             }
-            else
-            {
-                //TODO when can this be deleted 
-                IniFile iniFile = new IniFile("mssql_connection.ini");
-                string settingDataSource = iniFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = iniFile.ParseFileReadValue("user_id");
-                string settingPassword = iniFile.ParseFileReadValue("password");
-
-                _Database =
-                    new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                     settingPassword);
-            }
 
             //Migration settings
             _Database.CheckMigration(_migrationStore);
@@ -96,18 +83,18 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionID">region ID.</param>
         /// <returns></returns>
-        public EstateSettings LoadEstateSettings(UUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
             EstateSettings es = new EstateSettings();
 
             string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = @RegionID";
 
             bool insertEstate = false;
-
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID));
-
+                conn.Open();
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
@@ -124,7 +111,7 @@ namespace OpenSim.Data.MSSQL
                             }
                             else if (_FieldMap[name].GetValue(es) is UUID)
                             {
-                                _FieldMap[name].SetValue(es, new UUID((Guid) reader[name])); // uuid);
+                                _FieldMap[name].SetValue(es, new UUID((Guid)reader[name])); // uuid);
                             }
                             else
                             {
@@ -140,7 +127,7 @@ namespace OpenSim.Data.MSSQL
             }
 
 
-            if (insertEstate)
+            if (insertEstate && create)
             {
                 List<string> names = new List<string>(FieldList);
 
@@ -149,34 +136,36 @@ namespace OpenSim.Data.MSSQL
                 sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
 
                 //_Log.Debug("[DB ESTATE]: SQL: " + sql);
-                using (SqlConnection connection = _Database.DatabaseConnection())
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand insertCommand = new SqlCommand(sql, conn))
                 {
-                    using (SqlCommand insertCommand = connection.CreateCommand())
-                    {
-                        insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
+                    insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
 
-                        foreach (string name in names)
-                        {
-                            insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
-                        }
-                        SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
-                        idParameter.Direction = ParameterDirection.Output;
-                        insertCommand.Parameters.Add(idParameter);
-
-                        insertCommand.ExecuteNonQuery();
-
-                        es.EstateID = Convert.ToUInt32(idParameter.Value);
+                    foreach (string name in names)
+                    {
+                        insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
                     }
+                    SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
+                    idParameter.Direction = ParameterDirection.Output;
+                    insertCommand.Parameters.Add(idParameter);
+                    conn.Open();
+                    insertCommand.ExecuteNonQuery();
+
+                    es.EstateID = Convert.ToUInt32(idParameter.Value);
                 }
 
-                using (AutoClosingSqlCommand cmd = _Database.Query("INSERT INTO [estate_map] ([RegionID] ,[EstateID]) VALUES (@RegionID, @EstateID)"))
+                sql = "INSERT INTO [estate_map] ([RegionID] ,[EstateID]) VALUES (@RegionID, @EstateID)";
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
                 {
+
                     cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID));
                     cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
                     // This will throw on dupe key
                     try
                     {
-                       cmd.ExecuteNonQuery();
+                        conn.Open();
+                        cmd.ExecuteNonQuery();
                     }
                     catch (Exception e)
                     {
@@ -184,23 +173,6 @@ namespace OpenSim.Data.MSSQL
                     }
                 }
 
-                // Munge and transfer the ban list
-
-                sql = string.Format("insert into estateban select {0}, bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = @UUID", es.EstateID);
-                using (AutoClosingSqlCommand cmd = _Database.Query(sql))
-                {
-                    cmd.Parameters.Add(_Database.CreateParameter("@UUID", regionID));
-                    try
-                    {
-
-                        cmd.ExecuteNonQuery();
-                    }
-                    catch (Exception)
-                    {
-                        _Log.Debug("[ESTATE DB]: Error setting up estateban from regionban");
-                    }
-                }
-
                 //TODO check if this is needed??
                 es.Save();
             }
@@ -226,7 +198,7 @@ namespace OpenSim.Data.MSSQL
 
             names.Remove("EstateID");
 
-            string sql = string.Format("UPDATE estate_settings SET ") ; 
+            string sql = string.Format("UPDATE estate_settings SET ");
             foreach (string name in names)
             {
                 sql += name + " = @" + name + ", ";
@@ -234,7 +206,8 @@ namespace OpenSim.Data.MSSQL
             sql = sql.Remove(sql.LastIndexOf(","));
             sql += " WHERE EstateID = @EstateID";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 foreach (string name in names)
                 {
@@ -242,6 +215,7 @@ namespace OpenSim.Data.MSSQL
                 }
 
                 cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
 
@@ -266,12 +240,13 @@ namespace OpenSim.Data.MSSQL
 
             string sql = "select bannedUUID from estateban where EstateID = @EstateID";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 SqlParameter idParameter = new SqlParameter("@EstateID", SqlDbType.Int);
                 idParameter.Value = es.EstateID;
                 cmd.Parameters.Add(idParameter);
-
+                conn.Open();
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
@@ -293,10 +268,11 @@ namespace OpenSim.Data.MSSQL
 
             string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
-
+                conn.Open();
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
@@ -313,20 +289,24 @@ namespace OpenSim.Data.MSSQL
         {
             //Delete first
             string sql = "delete from estateban where EstateID = @EstateID";
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            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 (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 foreach (EstateBan b in es.EstateBans)
                 {
                     cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
                     cmd.Parameters.Add(_Database.CreateParameter("@bannedUUID", b.BannedUserID));
+                    conn.Open();
                     cmd.ExecuteNonQuery();
                     cmd.Parameters.Clear();
                 }
@@ -337,14 +317,16 @@ namespace OpenSim.Data.MSSQL
         {
             //Delete first
             string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            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 (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@EstateID", estateID));
 
@@ -359,11 +341,36 @@ namespace OpenSim.Data.MSSQL
                     }
                     else
                         cmd.Parameters["@uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
-
+                    conn.Open();
                     cmd.ExecuteNonQuery();
                 }
             }
         }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            return new EstateSettings();
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            return new List<int>();
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            return false;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            return new List<UUID>();
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            return false;
+        }
         #endregion
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
new file mode 100644
index 0000000..af4fd9b
--- /dev/null
+++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.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;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Data.SqlClient;
+using System.Reflection;
+using System.Text;
+
+namespace OpenSim.Data.MSSQL
+{
+    public class MSSQLFriendsData : MSSQLGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public MSSQLFriendsData(string connectionString, string realm)
+            : base(connectionString, realm, "FriendsStore")
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            {
+                conn.Open();
+                Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
+                m.Update();
+            }
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where PrincipalID = @PrincipalID and Friend = @Friend", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@Friend", friend));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+
+                return true;
+            }
+        }
+
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = @PrincipalID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
new file mode 100644
index 0000000..904366e
--- /dev/null
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using log4net;
+using System.Data.SqlClient;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using System.Text;
+
+namespace OpenSim.Data.MSSQL
+{
+    public class MSSQLGenericTableHandler<T> where T : class, new()
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected string m_ConnectionString;
+        protected MSSQLManager m_database; //used for parameter type translation
+        protected Dictionary<string, FieldInfo> m_Fields =
+                new Dictionary<string, FieldInfo>();
+
+        protected List<string> m_ColumnNames = null;
+        protected string m_Realm;
+        protected FieldInfo m_DataField = null;
+
+        public MSSQLGenericTableHandler(string connectionString,
+                string realm, string storeName)
+        {
+            m_Realm = realm;
+
+            if (storeName != String.Empty)
+            {
+                Assembly assem = GetType().Assembly;
+                m_ConnectionString = connectionString;
+                using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+                {
+                    conn.Open();
+                    Migration m = new Migration(conn, assem, storeName);
+                    m.Update();
+                }
+
+            }
+            m_database = new MSSQLManager(m_ConnectionString);
+
+            Type t = typeof(T);
+            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
+                                             BindingFlags.Instance |
+                                             BindingFlags.DeclaredOnly);
+
+            if (fields.Length == 0)
+                return;
+
+            foreach (FieldInfo f in fields)
+            {
+                if (f.Name != "Data")
+                    m_Fields[f.Name] = f;
+                else
+                    m_DataField = f;
+            }
+
+        }
+
+        private void CheckColumnNames(SqlDataReader reader)
+        {
+            if (m_ColumnNames != null)
+                return;
+
+            m_ColumnNames = new List<string>();
+
+            DataTable schemaTable = reader.GetSchemaTable();
+            foreach (DataRow row in schemaTable.Rows)
+            {
+                if (row["ColumnName"] != null &&
+                        (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
+                    m_ColumnNames.Add(row["ColumnName"].ToString());
+
+            }
+        }
+
+        private List<string> GetConstraints()
+        {
+            List<string> constraints = new List<string>();
+            string query = string.Format(@"SELECT 
+                            COL_NAME(ic.object_id,ic.column_id) AS column_name
+                            FROM sys.indexes AS i
+                            INNER JOIN sys.index_columns AS ic 
+                              ON i.object_id = ic.object_id AND i.index_id = ic.index_id
+                            WHERE i.is_primary_key = 1 
+                            AND i.object_id = OBJECT_ID('{0}');", m_Realm);
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand(query, conn))
+            {
+                conn.Open();
+                using (SqlDataReader rdr = cmd.ExecuteReader())
+                {
+                    while (rdr.Read())
+                    {
+                        // query produces 0 to many rows of single column, so always add the first item in each row
+                        constraints.Add((string)rdr[0]);
+                    }
+                }
+                return constraints;
+            }
+        }
+
+        public virtual T[] Get(string field, string key)
+        {
+            return Get(new string[] { field }, new string[] { key });
+        }
+
+        public virtual T[] Get(string[] fields, string[] keys)
+        {
+            if (fields.Length != keys.Length)
+                return new T[0];
+
+            List<string> terms = new List<string>();
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
+                    terms.Add("[" + fields[i] + "] = @" + fields[i]);
+                }
+
+                string where = String.Join(" AND ", terms.ToArray());
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        protected T[] DoQuery(SqlCommand cmd)
+        {
+            using (SqlDataReader reader = cmd.ExecuteReader())
+            {
+                if (reader == null)
+                    return new T[0];
+
+                CheckColumnNames(reader);
+
+                List<T> result = new List<T>();
+
+                while (reader.Read())
+                {
+                    T row = new T();
+
+                    foreach (string name in m_Fields.Keys)
+                    {
+                        if (m_Fields[name].GetValue(row) is bool)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v != 0 ? true : false);
+                        }
+                        else if (m_Fields[name].GetValue(row) is UUID)
+                        {
+                            UUID uuid = UUID.Zero;
+
+                            UUID.TryParse(reader[name].ToString(), out uuid);
+                            m_Fields[name].SetValue(row, uuid);
+                        }
+                        else if (m_Fields[name].GetValue(row) is int)
+                        {
+                            int v = Convert.ToInt32(reader[name]);
+                            m_Fields[name].SetValue(row, v);
+                        }
+                        else
+                        {
+                            m_Fields[name].SetValue(row, reader[name]);
+                        }
+                    }
+
+                    if (m_DataField != null)
+                    {
+                        Dictionary<string, string> data =
+                                new Dictionary<string, string>();
+
+                        foreach (string col in m_ColumnNames)
+                        {
+                            data[col] = reader[col].ToString();
+                            if (data[col] == null)
+                                data[col] = String.Empty;
+                        }
+
+                        m_DataField.SetValue(row, data);
+                    }
+
+                    result.Add(row);
+                }
+                return result.ToArray();
+            }
+        }
+
+        public virtual T[] Get(string where)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                string query = String.Format("SELECT * FROM {0} WHERE {1}",
+                        m_Realm, where);
+                cmd.Connection = conn;
+                cmd.CommandText = query;
+
+                //m_log.WarnFormat("[MSSQLGenericTable]: SELECT {0} WHERE {1}", m_Realm, where);
+
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public virtual bool Store(T row)
+        {
+            List<string> constraintFields = GetConstraints();
+            List<KeyValuePair<string, string>> constraints = new List<KeyValuePair<string, string>>();
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                StringBuilder query = new StringBuilder();
+                List<String> names = new List<String>();
+                List<String> values = new List<String>();
+
+                foreach (FieldInfo fi in m_Fields.Values)
+                {
+                    names.Add(fi.Name);
+                    values.Add("@" + fi.Name);
+                    if (constraintFields.Count > 0 && constraintFields.Contains(fi.Name))
+                    {
+                        constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString()));
+                    }
+                    cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row).ToString()));
+                }
+
+                if (m_DataField != null)
+                {
+                    Dictionary<string, string> data =
+                            (Dictionary<string, string>)m_DataField.GetValue(row);
+
+                    foreach (KeyValuePair<string, string> kvp in data)
+                    {
+                        if (constraintFields.Count > 0 && constraintFields.Contains(kvp.Key))
+                        {
+                            constraints.Add(new KeyValuePair<string, string>(kvp.Key, kvp.Key));
+                        }
+                        names.Add(kvp.Key);
+                        values.Add("@" + kvp.Key);
+                        cmd.Parameters.Add(m_database.CreateParameter("@" + kvp.Key, kvp.Value));
+                    }
+
+                }
+
+                query.AppendFormat("UPDATE {0} SET ", m_Realm);
+                int i = 0;
+                for (i = 0; i < names.Count - 1; i++)
+                {
+                    query.AppendFormat("[{0}] = {1}, ", names[i], values[i]);
+                }
+                query.AppendFormat("[{0}] = {1} ", names[i], values[i]);
+                if (constraints.Count > 0)
+                {
+                    List<string> terms = new List<string>();
+                    for (int j = 0; j < constraints.Count; j++)
+                    {
+                        terms.Add(" [" + constraints[j].Key + "] = @" + constraints[j].Key);
+                    }
+                    string where = String.Join(" AND ", terms.ToArray());
+                    query.AppendFormat(" WHERE {0} ", where);
+                    
+                }
+                cmd.Connection = conn;
+                cmd.CommandText = query.ToString();
+                
+                conn.Open();
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.WarnFormat("[MSSQLGenericTable]: Updating {0}", m_Realm);
+                    return true;
+                }
+                else
+                {
+                    // assume record has not yet been inserted
+
+                    query = new StringBuilder();
+                    query.AppendFormat("INSERT INTO {0} ([", m_Realm);
+                    query.Append(String.Join("],[", names.ToArray()));
+                    query.Append("]) values (" + String.Join(",", values.ToArray()) + ")");
+                    cmd.Connection = conn;
+                    cmd.CommandText = query.ToString();
+                    //m_log.WarnFormat("[MSSQLGenericTable]: Inserting into {0}", m_Realm);
+                    if (conn.State != ConnectionState.Open)
+                        conn.Open();
+                    if (cmd.ExecuteNonQuery() > 0)
+                        return true;
+                }
+
+                return false;
+            }
+        }
+
+        public virtual bool Delete(string field, string val)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+                string deleteCommand = String.Format("DELETE FROM {0} WHERE [{1}] = @{1}", m_Realm, field);
+                cmd.CommandText = deleteCommand;
+                
+                cmd.Parameters.Add(m_database.CreateParameter(field, val));
+                cmd.Connection = conn;
+                conn.Open();
+
+                if (cmd.ExecuteNonQuery() > 0)
+                {
+                    //m_log.Warn("[MSSQLGenericTable]: " + deleteCommand);
+                    return true;
+                }
+                return false;
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
deleted file mode 100644
index 8a3d332..0000000
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A grid data interface for MSSQL Server
-    /// </summary>
-    public class MSSQLGridData : GridDataBase
-    {
-        private const string _migrationStore = "GridStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Database manager
-        /// </summary>
-        private MSSQLManager database;
-
-        private string m_regionsTableName = "regions";
-
-        #region IPlugin Members
-
-        // [Obsolete("Cannot be default-initialized!")]
-        override public void Initialise()
-        {
-            m_log.Info("[GRID DB]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// Initialises the Grid Interface
-        /// </summary>
-        /// <param name="connectionString">connect string</param>
-        /// <remarks>use mssql_connection.ini</remarks>
-        override public void Initialise(string connectionString)
-        {
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                database = new MSSQLManager(connectionString);
-            }
-            else
-            {
-                // TODO: make the connect string actually do something
-                IniFile iniFile = new IniFile("mssql_connection.ini");
-
-                string settingDataSource = iniFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = iniFile.ParseFileReadValue("user_id");
-                string settingPassword = iniFile.ParseFileReadValue("password");
-
-                m_regionsTableName = iniFile.ParseFileReadValue("regionstablename");
-                if (m_regionsTableName == null)
-                {
-                    m_regionsTableName = "regions";
-                }
-
-                database =
-                    new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                     settingPassword);
-            }
-
-            //New migrations check of store
-            database.CheckMigration(_migrationStore);
-        }
-
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        override public void Dispose()
-        {
-            database = null;
-        }
-
-        /// <summary>
-        /// The name of this DB provider.
-        /// </summary>
-        /// <returns>A string containing the storage system name</returns>
-        override public string Name
-        {
-            get { return "MSSQL OpenGridData"; }
-        }
-
-        /// <summary>
-        /// Database provider version.
-        /// </summary>
-        /// <returns>A string containing the storage system version</returns>
-        override public string Version
-        {
-            get { return "0.1"; }
-        }
-
-        #endregion
-
-        #region Public override GridDataBase methods
-
-        /// <summary>
-        /// Returns a list of regions within the specified ranges
-        /// </summary>
-        /// <param name="xmin">minimum X coordinate</param>
-        /// <param name="ymin">minimum Y coordinate</param>
-        /// <param name="xmax">maximum X coordinate</param>
-        /// <param name="ymax">maximum Y coordinate</param>
-        /// <returns>null</returns>
-        /// <remarks>always return null</remarks>
-        override public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
-        {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM regions WHERE locX >= @xmin AND locX <= @xmax AND locY >= @ymin AND locY <= @ymax"))
-            {
-                command.Parameters.Add(database.CreateParameter("xmin", xmin));
-                command.Parameters.Add(database.CreateParameter("ymin", ymin));
-                command.Parameters.Add(database.CreateParameter("xmax", xmax));
-                command.Parameters.Add(database.CreateParameter("ymax", ymax));
-
-                List<RegionProfileData> rows = new List<RegionProfileData>();
-
-                using (SqlDataReader reader = command.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        rows.Add(ReadSimRow(reader));
-                    }
-                }
-
-                if (rows.Count > 0)
-                {
-                    return rows.ToArray();
-                }
-            }
-            m_log.Info("[GRID DB] : Found no regions within range.");
-            return null;
-        }
-
-        
-        /// <summary>
-        /// Returns up to maxNum profiles of regions that have a name starting with namePrefix
-        /// </summary>
-        /// <param name="namePrefix">The name to match against</param>
-        /// <param name="maxNum">Maximum number of profiles to return</param>
-        /// <returns>A list of sim profiles</returns>
-        override public List<RegionProfileData> GetRegionsByName (string namePrefix, uint maxNum)
-        {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM regions WHERE regionName LIKE @name"))
-            {
-                command.Parameters.Add(database.CreateParameter("name", namePrefix + "%"));
-
-                List<RegionProfileData> rows = new List<RegionProfileData>();
-
-                using (SqlDataReader reader = command.ExecuteReader())
-                {
-                    while (rows.Count < maxNum && reader.Read())
-                    {
-                        rows.Add(ReadSimRow(reader));
-                    }
-                }
-
-                return rows;
-            }
-        }
-
-        /// <summary>
-        /// Returns a sim profile from its location
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        override public RegionProfileData GetProfileByHandle(ulong handle)
-        {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM " + m_regionsTableName + " WHERE regionHandle = @handle"))
-            {
-                command.Parameters.Add(database.CreateParameter("handle", handle));
-
-                using (SqlDataReader reader = command.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        return ReadSimRow(reader);
-                    }
-                }
-            }
-            m_log.InfoFormat("[GRID DB] : No region found with handle : {0}", handle);
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a sim profile from its UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByUUID(UUID uuid)
-        {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM " + m_regionsTableName + " WHERE uuid = @uuid"))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", uuid));
-
-                using (SqlDataReader reader = command.ExecuteReader())
-                {
-                    if (reader.Read())
-                    {
-                        return ReadSimRow(reader);
-                    }
-                }
-            }
-            m_log.InfoFormat("[GRID DB] : No region found with UUID : {0}", uuid);
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's Region name string
-        /// </summary>
-        /// <param name="regionName">The region name search query</param>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByString(string regionName)
-        {
-            if (regionName.Length > 2)
-            {
-                using (AutoClosingSqlCommand command = database.Query("SELECT top 1 * FROM " + m_regionsTableName + " WHERE regionName like @regionName order by regionName"))
-                {
-                    command.Parameters.Add(database.CreateParameter("regionName", regionName + "%"));
-
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        if (reader.Read())
-                        {
-                            return ReadSimRow(reader);
-                        }
-                    }
-                }
-                m_log.InfoFormat("[GRID DB] : No region found with regionName : {0}", regionName);
-                return null;
-            }
-
-            m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters");
-            return null;
-        }
-
-        /// <summary>
-        /// Adds a new specified region to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse StoreProfile(RegionProfileData profile)
-        {
-            if (GetProfileByUUID(profile.UUID) == null)
-            {
-                if (InsertRegionRow(profile))
-                {
-                    return DataResponse.RESPONSE_OK;
-                }
-            }
-            else
-            {
-                if (UpdateRegionRow(profile))
-                {
-                    return DataResponse.RESPONSE_OK;
-                }
-            }
-
-            return DataResponse.RESPONSE_ERROR;
-        }
-
-        /// <summary>
-        /// Deletes a sim profile from the database
-        /// </summary>
-        /// <param name="uuid">the sim UUID</param>
-        /// <returns>Successful?</returns>
-        //public DataResponse DeleteProfile(RegionProfileData profile)
-        override public DataResponse DeleteProfile(string uuid)
-        {
-            using (AutoClosingSqlCommand command = database.Query("DELETE FROM regions WHERE uuid = @uuid;"))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", uuid));
-                try
-                {
-                    command.ExecuteNonQuery();
-                    return DataResponse.RESPONSE_OK;
-                }
-                catch (Exception e)
-                {
-                    m_log.DebugFormat("[GRID DB] : Error deleting region info, error is : {0}", e.Message);
-                    return DataResponse.RESPONSE_ERROR;
-                }
-            }
-        }
-
-        #endregion
-
-        #region Methods that are not used or deprecated (still needed because of base class)
-
-        /// <summary>
-        /// DEPRECATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-
-            RegionProfileData data = GetProfileByUUID(uuid);
-
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
-        {
-            // SHA512Managed HashProvider = new SHA512Managed();
-            // Encoding TextProvider = new UTF8Encoding();
-
-            // byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
-            // byte[] hash = HashProvider.ComputeHash(stream);
-            return false;
-        }
-
-        /// <summary>
-        /// NOT IMPLEMENTED
-        /// WHEN IS THIS GONNA BE IMPLEMENTED.
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns>null</returns>
-        override public ReservationData GetReservationAtPoint(uint x, uint y)
-        {
-            return null;
-        }
-
-        #endregion
-
-        #region private methods
-
-        /// <summary>
-        /// Reads a region row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region profile</returns>
-        private static RegionProfileData ReadSimRow(IDataRecord reader)
-        {
-            RegionProfileData retval = new RegionProfileData();
-
-            // Region Main gotta-have-or-we-return-null parts
-            UInt64 tmp64;
-            if (!UInt64.TryParse(reader["regionHandle"].ToString(), out tmp64))
-            {
-                return null;
-            }
-
-            retval.regionHandle = tmp64;
-
-//            UUID tmp_uuid;
-//            if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
-//            {
-//                return null;
-//            }
-
-            retval.UUID = new UUID((Guid)reader["uuid"]); // tmp_uuid;
-
-            // non-critical parts
-            retval.regionName = reader["regionName"].ToString();
-            retval.originUUID = new UUID((Guid)reader["originUUID"]);
-
-            // Secrets
-            retval.regionRecvKey = reader["regionRecvKey"].ToString();
-            retval.regionSecret = reader["regionSecret"].ToString();
-            retval.regionSendKey = reader["regionSendKey"].ToString();
-
-            // Region Server
-            retval.regionDataURI = reader["regionDataURI"].ToString();
-            retval.regionOnline = false; // Needs to be pinged before this can be set.
-            retval.serverIP = reader["serverIP"].ToString();
-            retval.serverPort = Convert.ToUInt32(reader["serverPort"]);
-            retval.serverURI = reader["serverURI"].ToString();
-            retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());
-            retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());
-
-            // Location
-            retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
-            retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());
-            retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());
-
-            // Neighbours - 0 = No Override
-            retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());
-            retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());
-            retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());
-            retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());
-
-            // Assets
-            retval.regionAssetURI = reader["regionAssetURI"].ToString();
-            retval.regionAssetRecvKey = reader["regionAssetRecvKey"].ToString();
-            retval.regionAssetSendKey = reader["regionAssetSendKey"].ToString();
-
-            // Userserver
-            retval.regionUserURI = reader["regionUserURI"].ToString();
-            retval.regionUserRecvKey = reader["regionUserRecvKey"].ToString();
-            retval.regionUserSendKey = reader["regionUserSendKey"].ToString();
-
-            // World Map Addition
-            retval.regionMapTextureID = new UUID((Guid)reader["regionMapTexture"]);
-            retval.owner_uuid = new UUID((Guid)reader["owner_uuid"]);
-            retval.maturity = Convert.ToUInt32(reader["access"]);
-            return retval;
-        }
-
-        /// <summary>
-        /// Update the specified region in the database
-        /// </summary>
-        /// <param name="profile">The profile to update</param>
-        /// <returns>success ?</returns>
-        private bool UpdateRegionRow(RegionProfileData profile)
-        {
-            bool returnval = false;
-
-            //Insert new region
-            string sql =
-                "UPDATE " + m_regionsTableName + @" SET
-                [regionHandle]=@regionHandle, [regionName]=@regionName,
-                [regionRecvKey]=@regionRecvKey, [regionSecret]=@regionSecret, [regionSendKey]=@regionSendKey,
-                [regionDataURI]=@regionDataURI, [serverIP]=@serverIP, [serverPort]=@serverPort, [serverURI]=@serverURI,
-                [locX]=@locX, [locY]=@locY, [locZ]=@locZ, [eastOverrideHandle]=@eastOverrideHandle,
-                [westOverrideHandle]=@westOverrideHandle, [southOverrideHandle]=@southOverrideHandle,
-                [northOverrideHandle]=@northOverrideHandle, [regionAssetURI]=@regionAssetURI,
-                [regionAssetRecvKey]=@regionAssetRecvKey, [regionAssetSendKey]=@regionAssetSendKey,
-                [regionUserURI]=@regionUserURI, [regionUserRecvKey]=@regionUserRecvKey, [regionUserSendKey]=@regionUserSendKey,
-                [regionMapTexture]=@regionMapTexture, [serverHttpPort]=@serverHttpPort,
-                [serverRemotingPort]=@serverRemotingPort, [owner_uuid]=@owner_uuid , [originUUID]=@originUUID
-                where [uuid]=@uuid";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("regionHandle", profile.regionHandle));
-                command.Parameters.Add(database.CreateParameter("regionName", profile.regionName));
-                command.Parameters.Add(database.CreateParameter("uuid", profile.UUID));
-                command.Parameters.Add(database.CreateParameter("regionRecvKey", profile.regionRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionSecret", profile.regionSecret));
-                command.Parameters.Add(database.CreateParameter("regionSendKey", profile.regionSendKey));
-                command.Parameters.Add(database.CreateParameter("regionDataURI", profile.regionDataURI));
-                command.Parameters.Add(database.CreateParameter("serverIP", profile.serverIP));
-                command.Parameters.Add(database.CreateParameter("serverPort", profile.serverPort));
-                command.Parameters.Add(database.CreateParameter("serverURI", profile.serverURI));
-                command.Parameters.Add(database.CreateParameter("locX", profile.regionLocX));
-                command.Parameters.Add(database.CreateParameter("locY", profile.regionLocY));
-                command.Parameters.Add(database.CreateParameter("locZ", profile.regionLocZ));
-                command.Parameters.Add(database.CreateParameter("eastOverrideHandle", profile.regionEastOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("westOverrideHandle", profile.regionWestOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("northOverrideHandle", profile.regionNorthOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("southOverrideHandle", profile.regionSouthOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("regionAssetURI", profile.regionAssetURI));
-                command.Parameters.Add(database.CreateParameter("regionAssetRecvKey", profile.regionAssetRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionAssetSendKey", profile.regionAssetSendKey));
-                command.Parameters.Add(database.CreateParameter("regionUserURI", profile.regionUserURI));
-                command.Parameters.Add(database.CreateParameter("regionUserRecvKey", profile.regionUserRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionUserSendKey", profile.regionUserSendKey));
-                command.Parameters.Add(database.CreateParameter("regionMapTexture", profile.regionMapTextureID));
-                command.Parameters.Add(database.CreateParameter("serverHttpPort", profile.httpPort));
-                command.Parameters.Add(database.CreateParameter("serverRemotingPort", profile.remotingPort));
-                command.Parameters.Add(database.CreateParameter("owner_uuid", profile.owner_uuid));
-                command.Parameters.Add(database.CreateParameter("originUUID", profile.originUUID));
-
-                try
-                {
-                    command.ExecuteNonQuery();
-                    returnval = true;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[GRID DB] : Error updating region, error: " + e.Message);
-                }
-            }
-
-            return returnval;
-        }
-
-        /// <summary>
-        /// Creates a new region in the database
-        /// </summary>
-        /// <param name="profile">The region profile to insert</param>
-        /// <returns>Successful?</returns>
-        private bool InsertRegionRow(RegionProfileData profile)
-        {
-            bool returnval = false;
-
-            //Insert new region
-            string sql =
-                "INSERT INTO " + m_regionsTableName + @" ([regionHandle], [regionName], [uuid], [regionRecvKey], [regionSecret], [regionSendKey], [regionDataURI], 
-                                                      [serverIP], [serverPort], [serverURI], [locX], [locY], [locZ], [eastOverrideHandle], [westOverrideHandle], 
-                                                      [southOverrideHandle], [northOverrideHandle], [regionAssetURI], [regionAssetRecvKey], [regionAssetSendKey], 
-                                                      [regionUserURI], [regionUserRecvKey], [regionUserSendKey], [regionMapTexture], [serverHttpPort], 
-                                                      [serverRemotingPort], [owner_uuid], [originUUID], [access]) 
-                                                VALUES (@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, 
-                                                        @serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, 
-                                                        @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, @regionAssetSendKey, 
-                                                        @regionUserURI, @regionUserRecvKey, @regionUserSendKey, @regionMapTexture, @serverHttpPort, @serverRemotingPort, @owner_uuid, @originUUID, @access);";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("regionHandle", profile.regionHandle));
-                command.Parameters.Add(database.CreateParameter("regionName", profile.regionName));
-                command.Parameters.Add(database.CreateParameter("uuid", profile.UUID));
-                command.Parameters.Add(database.CreateParameter("regionRecvKey", profile.regionRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionSecret", profile.regionSecret));
-                command.Parameters.Add(database.CreateParameter("regionSendKey", profile.regionSendKey));
-                command.Parameters.Add(database.CreateParameter("regionDataURI", profile.regionDataURI));
-                command.Parameters.Add(database.CreateParameter("serverIP", profile.serverIP));
-                command.Parameters.Add(database.CreateParameter("serverPort", profile.serverPort));
-                command.Parameters.Add(database.CreateParameter("serverURI", profile.serverURI));
-                command.Parameters.Add(database.CreateParameter("locX", profile.regionLocX));
-                command.Parameters.Add(database.CreateParameter("locY", profile.regionLocY));
-                command.Parameters.Add(database.CreateParameter("locZ", profile.regionLocZ));
-                command.Parameters.Add(database.CreateParameter("eastOverrideHandle", profile.regionEastOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("westOverrideHandle", profile.regionWestOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("northOverrideHandle", profile.regionNorthOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("southOverrideHandle", profile.regionSouthOverrideHandle));
-                command.Parameters.Add(database.CreateParameter("regionAssetURI", profile.regionAssetURI));
-                command.Parameters.Add(database.CreateParameter("regionAssetRecvKey", profile.regionAssetRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionAssetSendKey", profile.regionAssetSendKey));
-                command.Parameters.Add(database.CreateParameter("regionUserURI", profile.regionUserURI));
-                command.Parameters.Add(database.CreateParameter("regionUserRecvKey", profile.regionUserRecvKey));
-                command.Parameters.Add(database.CreateParameter("regionUserSendKey", profile.regionUserSendKey));
-                command.Parameters.Add(database.CreateParameter("regionMapTexture", profile.regionMapTextureID));
-                command.Parameters.Add(database.CreateParameter("serverHttpPort", profile.httpPort));
-                command.Parameters.Add(database.CreateParameter("serverRemotingPort", profile.remotingPort));
-                command.Parameters.Add(database.CreateParameter("owner_uuid", profile.owner_uuid));
-                command.Parameters.Add(database.CreateParameter("originUUID", profile.originUUID));
-                command.Parameters.Add(database.CreateParameter("access", profile.maturity));
-
-                try
-                {
-                    command.ExecuteNonQuery();
-                    returnval = true;
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[GRID DB] : Error inserting region, error: " + e.Message);
-                }
-            }
-
-            return returnval;
-        }
-
-        #endregion
-    }
-}
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index a03488b..9993720 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -25,28 +25,44 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
 using OpenMetaverse;
+using OpenSim.Framework;
+using System.Data.SqlClient;
 
-namespace OpenSim.Data
+namespace OpenSim.Data.MSSQL
 {
-    public abstract class GridDataBase : IGridDataPlugin
+    /// <summary>
+    /// A MSSQL Interface for Avatar Storage
+    /// </summary>
+    public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>,
+            IGridUserData
     {
-        public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
-        public abstract RegionProfileData GetProfileByUUID(UUID UUID);
-        public abstract RegionProfileData GetProfileByString(string regionName);
-        public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
-        public abstract List<RegionProfileData> GetRegionsByName(string namePrefix, uint maxNum);
-        public abstract bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
-        public abstract DataResponse StoreProfile(RegionProfileData profile);
-        public abstract ReservationData GetReservationAtPoint(uint x, uint y);
-        public abstract DataResponse DeleteProfile(string uuid);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public abstract void Initialise();
-        public abstract void Initialise(string connect);
-        public abstract void Dispose();
+        public MSSQLGridUserData(string connectionString, string realm) :
+            base(connectionString, realm, "UserGrid")
+        {
+        }
 
-        public abstract string Name { get; }
-        public abstract string Version { get; }
+        public GridUserData GetGridUserData(string userID)
+        {
+            GridUserData[] ret = Get("UserID", userID);
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public bool StoreGridUserData(GridUserData data)
+        {
+            return Store(data);
+        }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 1482184..4815700 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Data.MSSQL
         /// The database manager
         /// </summary>
         private MSSQLManager database;
+        private string m_connectionString;
 
         #region IPlugin members
 
@@ -66,24 +67,9 @@ namespace OpenSim.Data.MSSQL
         /// <remarks>use mssql_connection.ini</remarks>
         public void Initialise(string connectionString)
         {
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                database = new MSSQLManager(connectionString);
-            }
-            else
-            {
-                IniFile gridDataMSSqlFile = new IniFile("mssql_connection.ini");
-                string settingDataSource = gridDataMSSqlFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = gridDataMSSqlFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = gridDataMSSqlFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = gridDataMSSqlFile.ParseFileReadValue("user_id");
-                string settingPassword = gridDataMSSqlFile.ParseFileReadValue("password");
-
-                database =
-                    new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                     settingPassword);
-            }
-
+            m_connectionString = connectionString;
+            database = new MSSQLManager(connectionString);
+          
             //New migrations check of store
             database.CheckMigration(_migrationStore);
         }
@@ -169,11 +155,13 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A folder class</returns>
         public InventoryFolderBase getInventoryFolder(UUID folderID)
         {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM inventoryfolders WHERE folderID = @folderID"))
+            string sql = "SELECT * FROM inventoryfolders WHERE folderID = @folderID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("folderID", folderID));
-
-                using (IDataReader reader = command.ExecuteReader())
+                cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -197,18 +185,19 @@ namespace OpenSim.Data.MSSQL
             //Note this is changed so it opens only one connection to the database and not everytime it wants to get data.
 
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
-
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID"))
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("@parentID", parentID));
-
-                folders.AddRange(getInventoryFolders(command));
+                cmd.Parameters.Add(database.CreateParameter("@parentID", parentID));
+                conn.Open();
+                folders.AddRange(getInventoryFolders(cmd));
 
                 List<InventoryFolderBase> tempFolders = new List<InventoryFolderBase>();
 
                 foreach (InventoryFolderBase folderBase in folders)
                 {
-                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, command));
+                    tempFolders.AddRange(getFolderHierarchy(folderBase.ID, cmd));
                 }
                 if (tempFolders.Count > 0)
                 {
@@ -233,20 +222,19 @@ namespace OpenSim.Data.MSSQL
                 folderName = folderName.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add");
             }
-            
-            using (AutoClosingSqlCommand command = database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("folderID", folder.ID));
-                command.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
-                command.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                command.Parameters.Add(database.CreateParameter("folderName", folderName));
-                command.Parameters.Add(database.CreateParameter("type", folder.Type));
-                command.Parameters.Add(database.CreateParameter("version", folder.Version));
-
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                conn.Open();
                 try
                 {
-                    //IDbCommand result = database.Query(sql, param);
-                    command.ExecuteNonQuery();
+                    cmd.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
@@ -275,20 +263,20 @@ namespace OpenSim.Data.MSSQL
                 folderName = folderName.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update");
             }
-            
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("folderID", folder.ID));
-                command.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
-                command.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                command.Parameters.Add(database.CreateParameter("folderName", folderName));
-                command.Parameters.Add(database.CreateParameter("type", folder.Type));
-                command.Parameters.Add(database.CreateParameter("version", folder.Version));
-                command.Parameters.Add(database.CreateParameter("@keyFolderID", folder.ID));
-                
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
+                cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("folderName", folderName));
+                cmd.Parameters.Add(database.CreateParameter("type", folder.Type));
+                cmd.Parameters.Add(database.CreateParameter("version", folder.Version));
+                cmd.Parameters.Add(database.CreateParameter("@keyFolderID", folder.ID));
+                conn.Open();
                 try
                 {
-                    command.ExecuteNonQuery();
+                    cmd.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
@@ -304,14 +292,15 @@ namespace OpenSim.Data.MSSQL
         public void moveInventoryFolder(InventoryFolderBase folder)
         {
             string sql = @"UPDATE inventoryfolders SET parentFolderID = @parentFolderID WHERE folderID = @folderID";
-            using (IDbCommand command = database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
-                command.Parameters.Add(database.CreateParameter("@folderID", folder.ID));
-
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
+                cmd.Parameters.Add(database.CreateParameter("@folderID", folder.ID));
+                conn.Open();
                 try
                 {
-                    command.ExecuteNonQuery();
+                    cmd.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
@@ -326,30 +315,27 @@ namespace OpenSim.Data.MSSQL
         /// <param name="folderID">Id of folder to delete</param>
         public void deleteInventoryFolder(UUID folderID)
         {
-            using (SqlConnection connection = database.DatabaseConnection())
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
+
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 List<InventoryFolderBase> subFolders;
-                using (SqlCommand command = new SqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID", connection))
-                {
-                    command.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero));
-
-                    AutoClosingSqlCommand autoCommand = new AutoClosingSqlCommand(command);
-
-                    subFolders = getFolderHierarchy(folderID, autoCommand);
-                }
+                cmd.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero));
+                conn.Open();
+                subFolders = getFolderHierarchy(folderID, cmd);
+                
 
                 //Delete all sub-folders
                 foreach (InventoryFolderBase f in subFolders)
                 {
-                    DeleteOneFolder(f.ID, connection);
-                    DeleteItemsInFolder(f.ID, connection);
+                    DeleteOneFolder(f.ID, conn);
+                    DeleteItemsInFolder(f.ID, conn);
                 }
 
                 //Delete the actual row
-                DeleteOneFolder(folderID, connection);
-                DeleteItemsInFolder(folderID, connection);
-
-                connection.Close();
+                DeleteOneFolder(folderID, conn);
+                DeleteItemsInFolder(folderID, conn);
             }
         }
 
@@ -364,13 +350,15 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A list containing inventory items</returns>
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID"))
+            string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
-
+                cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
+                conn.Open();
                 List<InventoryItemBase> items = new List<InventoryItemBase>();
 
-                using (SqlDataReader reader = command.ExecuteReader())
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {
@@ -388,11 +376,13 @@ namespace OpenSim.Data.MSSQL
         /// <returns>An inventory item</returns>
         public InventoryItemBase getInventoryItem(UUID itemID)
         {
-            using (AutoClosingSqlCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID"))
+            string sql = "SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                result.Parameters.Add(database.CreateParameter("inventoryID", itemID));
-
-                using (IDataReader reader = result.ExecuteReader())
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -441,8 +431,9 @@ namespace OpenSim.Data.MSSQL
                 itemDesc = item.Description.Substring(0, 128);
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
             }
-            
-            using (AutoClosingSqlCommand command = database.Query(sql))
+
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                 command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -464,7 +455,7 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
                 command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
                 command.Parameters.Add(database.CreateParameter("flags", item.Flags));
-
+                conn.Open();
                 try
                 {
                     command.ExecuteNonQuery();
@@ -476,9 +467,11 @@ namespace OpenSim.Data.MSSQL
             }
 
             sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID";
-            using (AutoClosingSqlCommand command = database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
+                conn.Open();
                 try
                 {
                     command.ExecuteNonQuery();
@@ -530,8 +523,9 @@ namespace OpenSim.Data.MSSQL
                 itemDesc = item.Description.Substring(0, 128);
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
             }
-            
-            using (AutoClosingSqlCommand command = database.Query(sql))
+
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                 command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -552,8 +546,8 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
                 command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
                 command.Parameters.Add(database.CreateParameter("flags", item.Flags));
-                command.Parameters.Add(database.CreateParameter("@keyInventoryID", item.ID));
-
+                command.Parameters.Add(database.CreateParameter("keyInventoryID", item.ID));
+                conn.Open();
                 try
                 {
                     command.ExecuteNonQuery();
@@ -573,13 +567,15 @@ namespace OpenSim.Data.MSSQL
         /// <param name="itemID">the item UUID</param>
         public void deleteInventoryItem(UUID itemID)
         {
-            using (AutoClosingSqlCommand command = database.Query("DELETE FROM inventoryitems WHERE inventoryID=@inventoryID"))
+            string sql = "DELETE FROM inventoryitems WHERE inventoryID=@inventoryID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                command.Parameters.Add(database.CreateParameter("inventoryID", itemID));
+                cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
                 try
                 {
-
-                    command.ExecuteNonQuery();
+                    conn.Open();
+                    cmd.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
@@ -607,12 +603,14 @@ namespace OpenSim.Data.MSSQL
         /// </returns>
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
         {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1"))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", avatarID));
-                command.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
-
-                using (IDataReader reader = command.ExecuteReader())
+            string sql = "SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(database.CreateParameter("uuid", avatarID));
+                cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
                     while (reader.Read())
@@ -656,7 +654,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="parentID">parent ID.</param>
         /// <param name="command">SQL command/connection to database</param>
         /// <returns></returns>
-        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, AutoClosingSqlCommand command)
+        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, SqlCommand command)
         {
             command.Parameters["@parentID"].Value = parentID.Guid; //.ToString();
 
@@ -687,7 +685,9 @@ namespace OpenSim.Data.MSSQL
         /// <returns></returns>
         private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
         {
-            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid"))
+            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 if (user == UUID.Zero)
                 {
@@ -698,7 +698,7 @@ namespace OpenSim.Data.MSSQL
                     command.Parameters.Add(database.CreateParameter("uuid", user));
                 }
                 command.Parameters.Add(database.CreateParameter("parentID", parentID));
-
+                conn.Open();
                 return getInventoryFolders(command);
             }
         }
@@ -708,9 +708,9 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="command">SQLcommand.</param>
         /// <returns></returns>
-        private static List<InventoryFolderBase> getInventoryFolders(AutoClosingSqlCommand command)
+        private static List<InventoryFolderBase> getInventoryFolders(SqlCommand command)
         {
-            using (IDataReader reader = command.ExecuteReader())
+            using (SqlDataReader reader = command.ExecuteReader())
             {
 
                 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -727,7 +727,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="reader">A MSSQL Data Reader</param>
         /// <returns>A List containing inventory folders</returns>
-        protected static InventoryFolderBase readInventoryFolder(IDataReader reader)
+        protected static InventoryFolderBase readInventoryFolder(SqlDataReader reader)
         {
             try
             {
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 0b430c7..d6cb91f 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -54,28 +54,16 @@ namespace OpenSim.Data.MSSQL
         /// The database manager
         /// </summary>
         private MSSQLManager _Database;
-      
+        private string m_connectionString;
         /// <summary>
         /// Initialises the region datastore
         /// </summary>
         /// <param name="connectionString">The connection string.</param>
         public void Initialise(string connectionString)
         {
-            if (!string.IsNullOrEmpty(connectionString))
-            {
-                _Database = new MSSQLManager(connectionString);
-            }
-            else
-            {
-                IniFile iniFile = new IniFile("mssql_connection.ini");
-                string settingDataSource = iniFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = iniFile.ParseFileReadValue("user_id");
-                string settingPassword = iniFile.ParseFileReadValue("password");
-
-                _Database = new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId, settingPassword);
-            }
+            m_connectionString = connectionString;
+            _Database = new MSSQLManager(connectionString);
+
 
             //Migration settings
             _Database.CheckMigration(_migrationStore);
@@ -102,17 +90,18 @@ namespace OpenSim.Data.MSSQL
             SceneObjectGroup grp = null;
 
 
-            string query = "SELECT *, " +
+            string sql = "SELECT *, " +
                            "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
                            "FROM prims " +
                            "LEFT JOIN primshapes ON prims.UUID = primshapes.UUID " +
                            "WHERE RegionUUID = @RegionUUID " +
                            "ORDER BY SceneGroupID asc, sort asc, LinkNumber asc";
 
-            using (AutoClosingSqlCommand command = _Database.Query(query))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
                 command.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID));
-
+                conn.Open();
                 using (SqlDataReader reader = command.ExecuteReader())
                 {
                     while (reader.Read())
@@ -122,7 +111,7 @@ namespace OpenSim.Data.MSSQL
                             sceneObjectPart.Shape = PrimitiveBaseShape.Default;
                         else
                             sceneObjectPart.Shape = BuildShape(reader);
-                        
+
                         prims[sceneObjectPart.UUID] = sceneObjectPart;
 
                         UUID groupID = new UUID((Guid)reader["SceneGroupID"]);
@@ -133,7 +122,7 @@ namespace OpenSim.Data.MSSQL
                                 objects[grp.UUID] = grp;
 
                             lastGroupID = groupID;
-                            
+
                             // There sometimes exist OpenSim bugs that 'orphan groups' so that none of the prims are
                             // recorded as the root prim (for which the UUID must equal the persisted group UUID).  In
                             // this case, force the UUID to be the same as the group UUID so that at least these can be
@@ -142,7 +131,7 @@ namespace OpenSim.Data.MSSQL
                             if (sceneObjectPart.UUID != groupID && groupID != UUID.Zero)
                             {
                                 _Log.WarnFormat(
-                                    "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID", 
+                                    "[REGION DB]: Found root prim {0} {1} at {2} where group was actually {3}.  Forcing UUID to group UUID",
                                     sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
 
                                 sceneObjectPart.UUID = groupID;
@@ -174,8 +163,10 @@ namespace OpenSim.Data.MSSQL
             // LoadItems only on those
             List<SceneObjectPart> primsWithInventory = new List<SceneObjectPart>();
             string qry = "select distinct primID from primitems";
-            using (AutoClosingSqlCommand command = _Database.Query(qry))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(qry, conn))
             {
+                conn.Open();
                 using (SqlDataReader itemReader = command.ExecuteReader())
                 {
                     while (itemReader.Read())
@@ -205,14 +196,16 @@ namespace OpenSim.Data.MSSQL
         /// <param name="allPrims">all prims with inventory on a region</param>
         private void LoadItems(List<SceneObjectPart> allPrimsWithInventory)
         {
-            
-            using (AutoClosingSqlCommand command = _Database.Query("SELECT * FROM primitems WHERE PrimID = @PrimID"))
+            string sql = "SELECT * FROM primitems WHERE PrimID = @PrimID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand command = new SqlCommand(sql, conn))
             {
+                conn.Open();
                 foreach (SceneObjectPart objectPart in allPrimsWithInventory)
                 {
                     command.Parameters.Clear();
                     command.Parameters.Add(_Database.CreateParameter("@PrimID", objectPart.UUID));
-                 
+                    
                     List<TaskInventoryItem> inventory = new List<TaskInventoryItem>();
 
                     using (SqlDataReader reader = command.ExecuteReader())
@@ -241,8 +234,9 @@ namespace OpenSim.Data.MSSQL
         {
             _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
 
-            using (SqlConnection conn = _Database.DatabaseConnection())
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
             {
+                conn.Open();
                 SqlTransaction transaction = conn.BeginTransaction();
 
                 try
@@ -437,8 +431,12 @@ ELSE
             lock (_Database)
             {
                 //Using the non transaction mode.
-                using (AutoClosingSqlCommand cmd = _Database.Query(sqlPrimShapes))
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand())
                 {
+                    cmd.Connection = conn;
+                    cmd.CommandText = sqlPrimShapes;
+                    conn.Open();
                     cmd.Parameters.Add(_Database.CreateParameter("objectID", objectID));
                     cmd.ExecuteNonQuery();
 
@@ -466,24 +464,30 @@ ELSE
 
             //Delete everything from PrimID
             //TODO add index on PrimID in DB, if not already exist
-            using (AutoClosingSqlCommand cmd = _Database.Query("DELETE PRIMITEMS WHERE primID = @primID"))
+
+            string sql = "DELETE PRIMITEMS WHERE primID = @primID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@primID", primID));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
 
-            string sql =
+            sql =
                 @"INSERT INTO primitems (
             itemID,primID,assetID,parentFolderID,invType,assetType,name,description,creationDate,creatorID,ownerID,lastOwnerID,groupID,
             nextPermissions,currentPermissions,basePermissions,everyonePermissions,groupPermissions,flags) 
             VALUES (@itemID,@primID,@assetID,@parentFolderID,@invType,@assetType,@name,@description,@creationDate,@creatorID,@ownerID,
             @lastOwnerID,@groupID,@nextPermissions,@currentPermissions,@basePermissions,@everyonePermissions,@groupPermissions,@flags)";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 foreach (TaskInventoryItem taskItem in items)
                 {
                     cmd.Parameters.AddRange(CreatePrimInventoryParameters(taskItem));
+                    conn.Open();
                     cmd.ExecuteNonQuery();
 
                     cmd.Parameters.Clear();
@@ -505,11 +509,12 @@ ELSE
 
             string sql = "select top 1 RegionUUID, Revision, Heightfield from terrain where RegionUUID = @RegionUUID order by Revision desc";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 // MySqlParameter param = new MySqlParameter();
                 cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
-
+                conn.Open();
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     int rev;
@@ -549,19 +554,23 @@ ELSE
 
             //Delete old terrain map
             string sql = "delete from terrain where RegionUUID=@RegionUUID";
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
 
             sql = "insert into terrain(RegionUUID, Revision, Heightfield) values(@RegionUUID, @Revision, @Heightfield)";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionID));
                 cmd.Parameters.Add(_Database.CreateParameter("@Revision", revision));
                 cmd.Parameters.Add(_Database.CreateParameter("@Heightfield", serializeTerrain(terrain)));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
 
@@ -580,11 +589,12 @@ ELSE
             string sql = "select * from land where RegionUUID = @RegionUUID";
 
             //Retrieve all land data from region
-            using (AutoClosingSqlCommand cmdLandData = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                cmdLandData.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionUUID));
-
-                using (SqlDataReader readerLandData = cmdLandData.ExecuteReader())
+                cmd.Parameters.Add(_Database.CreateParameter("@RegionUUID", regionUUID));
+                conn.Open();
+                using (SqlDataReader readerLandData = cmd.ExecuteReader())
                 {
                     while (readerLandData.Read())
                     {
@@ -597,10 +607,12 @@ ELSE
             foreach (LandData LandData in LandDataForRegion)
             {
                 sql = "select * from landaccesslist where LandUUID = @LandUUID";
-                using (AutoClosingSqlCommand cmdAccessList = _Database.Query(sql))
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
                 {
-                    cmdAccessList.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID));
-                    using (SqlDataReader readerAccessList = cmdAccessList.ExecuteReader())
+                    cmd.Parameters.Add(_Database.CreateParameter("@LandUUID", LandData.GlobalID));
+                    conn.Open();
+                    using (SqlDataReader readerAccessList = cmd.ExecuteReader())
                     {
                         while (readerAccessList.Read())
                         {
@@ -632,17 +644,20 @@ ELSE
 VALUES
 (@UUID,@RegionUUID,@LocalLandID,@Bitmap,@Name,@Description,@OwnerUUID,@IsGroupOwned,@Area,@AuctionID,@Category,@ClaimDate,@ClaimPrice,@GroupUUID,@SalePrice,@LandStatus,@LandFlags,@LandingType,@MediaAutoScale,@MediaTextureUUID,@MediaURL,@MusicURL,@PassHours,@PassPrice,@SnapshotUUID,@UserLocationX,@UserLocationY,@UserLocationZ,@UserLookAtX,@UserLookAtY,@UserLookAtZ,@AuthbuyerID,@OtherCleanTime,@Dwell)";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.AddRange(CreateLandParameters(parcel.LandData, parcel.RegionUUID));
-
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
 
             sql = "INSERT INTO [landaccesslist] ([LandUUID],[AccessUUID],[Flags]) VALUES (@LandUUID,@AccessUUID,@Flags)";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
+                conn.Open();
                 foreach (ParcelManager.ParcelAccessEntry parcelAccessEntry in parcel.LandData.ParcelAccessList)
                 {
                     cmd.Parameters.AddRange(CreateLandAccessParameters(parcelAccessEntry, parcel.RegionUUID));
@@ -659,25 +674,30 @@ VALUES
         /// <param name="globalID">UUID of landobject</param>
         public void RemoveLandObject(UUID globalID)
         {
-            using (AutoClosingSqlCommand cmd = _Database.Query("delete from land where UUID=@UUID"))
+            string sql = "delete from land where UUID=@UUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@UUID", globalID));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
-
-            using (AutoClosingSqlCommand cmd = _Database.Query("delete from landaccesslist where LandUUID=@UUID"))
+            sql = "delete from landaccesslist where LandUUID=@UUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@UUID", globalID));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
         }
-        public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             //This connector doesn't support the windlight module yet
             //Return default LL windlight settings
-            return new RegionMeta7WindlightData();
+            return new RegionLightShareData();
         }
-        public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             //This connector doesn't support the windlight module yet
         }
@@ -690,9 +710,11 @@ VALUES
         {
             string sql = "select * from regionsettings where regionUUID = @regionUUID";
             RegionSettings regionSettings;
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID));
+                conn.Open();
                 using (SqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
@@ -724,9 +746,12 @@ VALUES
         {
             //Little check if regionUUID already exist in DB
             string regionUUID;
-            using (AutoClosingSqlCommand cmd = _Database.Query("SELECT regionUUID FROM regionsettings WHERE regionUUID = @regionUUID"))
+            string sql = "SELECT regionUUID FROM regionsettings WHERE regionUUID = @regionUUID";
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionSettings.RegionUUID));
+                conn.Open();
                 regionUUID = cmd.ExecuteScalar().ToString();
             }
 
@@ -737,8 +762,8 @@ VALUES
             else
             {
                 //This method only updates region settings!!! First call LoadRegionSettings to create new region settings in DB
-                string sql =
-                    @"UPDATE [regionsettings] SET [block_terraform] = @block_terraform ,[block_fly] = @block_fly ,[allow_damage] = @allow_damage 
+                sql =
+                   @"UPDATE [regionsettings] SET [block_terraform] = @block_terraform ,[block_fly] = @block_fly ,[allow_damage] = @allow_damage 
 ,[restrict_pushing] = @restrict_pushing ,[allow_land_resell] = @allow_land_resell ,[allow_land_join_divide] = @allow_land_join_divide 
 ,[block_show_in_search] = @block_show_in_search ,[agent_limit] = @agent_limit ,[object_bonus] = @object_bonus ,[maturity] = @maturity 
 ,[disable_scripts] = @disable_scripts ,[disable_collisions] = @disable_collisions ,[disable_physics] = @disable_physics 
@@ -750,10 +775,11 @@ VALUES
 ,[covenant] = @covenant , [sunvectorx] = @sunvectorx, [sunvectory] = @sunvectory, [sunvectorz] = @sunvectorz,  [Sandbox] = @Sandbox, [loaded_creation_datetime] = @loaded_creation_datetime, [loaded_creation_id] = @loaded_creation_id
  WHERE [regionUUID] = @regionUUID";
 
-                using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
+                using (SqlCommand cmd = new SqlCommand(sql, conn))
                 {
                     cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
-
+                    conn.Open();
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -810,9 +836,11 @@ VALUES
                                 @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,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_datetime, @loaded_creation_id)";
 
-            using (AutoClosingSqlCommand cmd = _Database.Query(sql))
+            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
                 cmd.Parameters.AddRange(CreateRegionSettingParameters(regionSettings));
+                conn.Open();
                 cmd.ExecuteNonQuery();
             }
         }
@@ -916,15 +944,15 @@ VALUES
             newData.PassHours = Convert.ToSingle(row["PassHours"]);
             newData.PassPrice = Convert.ToInt32(row["PassPrice"]);
 
-//            UUID authedbuyer;
-//            UUID snapshotID;
-//
-//            if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
-//                newData.AuthBuyerID = authedbuyer;
-//
-//            if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
-//                newData.SnapshotID = snapshotID;
-            newData.AuthBuyerID = new UUID((Guid) row["AuthBuyerID"]);
+            //            UUID authedbuyer;
+            //            UUID snapshotID;
+            //
+            //            if (UUID.TryParse((string)row["AuthBuyerID"], out authedbuyer))
+            //                newData.AuthBuyerID = authedbuyer;
+            //
+            //            if (UUID.TryParse((string)row["SnapshotUUID"], out snapshotID))
+            //                newData.SnapshotID = snapshotID;
+            newData.AuthBuyerID = new UUID((Guid)row["AuthBuyerID"]);
             newData.SnapshotID = new UUID((Guid)row["SnapshotUUID"]);
 
             newData.OtherCleanTime = Convert.ToInt32(row["OtherCleanTime"]);
@@ -1193,7 +1221,7 @@ VALUES
         #endregion
 
         #region Create parameters methods
-        
+
         /// <summary>
         /// Creates the prim inventory parameters.
         /// </summary>
@@ -1477,7 +1505,7 @@ VALUES
 
             parameters.Add(_Database.CreateParameter("CollisionSound", prim.CollisionSound));
             parameters.Add(_Database.CreateParameter("CollisionSoundVolume", prim.CollisionSoundVolume));
-            if  (prim.PassTouches)
+            if (prim.PassTouches)
                 parameters.Add(_Database.CreateParameter("PassTouches", 1));
             else
                 parameters.Add(_Database.CreateParameter("PassTouches", 0));
@@ -1532,7 +1560,7 @@ VALUES
 
             return parameters.ToArray();
         }
-        
+
         #endregion
 
         #endregion
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
deleted file mode 100644
index 72c50e6..0000000
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using log4net;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// An interface to the log database for MSSQL
-    /// </summary>
-    internal class MSSQLLogData : ILogDataPlugin
-    {
-        private const string _migrationStore = "LogStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        public MSSQLManager database;
-
-        [Obsolete("Cannot be default-initialized!")]
-        public void Initialise()
-        {
-            m_log.Info("[LOG DB]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// Artificial constructor called when the plugin is loaded
-        /// </summary>
-        public void Initialise(string connect)
-        {
-            if (!string.IsNullOrEmpty(connect))
-            {
-                database = new MSSQLManager(connect);
-            }
-            else
-            {
-                // TODO: do something with the connect string
-                IniFile gridDataMSSqlFile = new IniFile("mssql_connection.ini");
-                string settingDataSource = gridDataMSSqlFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = gridDataMSSqlFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = gridDataMSSqlFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = gridDataMSSqlFile.ParseFileReadValue("user_id");
-                string settingPassword = gridDataMSSqlFile.ParseFileReadValue("password");
-
-                database =
-                    new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                     settingPassword);
-            }
-
-            //Updating mechanisme
-            database.CheckMigration(_migrationStore);
-        }
-
-        /// <summary>
-        /// Saves a log item to the database
-        /// </summary>
-        /// <param name="serverDaemon">The daemon triggering the event</param>
-        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">The message to log</param>
-        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,
-                            string logMessage)
-        {
-            string sql = "INSERT INTO logs ([target], [server], [method], [arguments], [priority], [message]) VALUES ";
-            sql += "(@target, @server, @method, @arguments, @priority, @message);";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("server", serverDaemon));
-                command.Parameters.Add(database.CreateParameter("target",target));
-                command.Parameters.Add(database.CreateParameter("method", methodCall));
-                command.Parameters.Add(database.CreateParameter("arguments", arguments));
-                command.Parameters.Add(database.CreateParameter("priority", priority.ToString()));
-                command.Parameters.Add(database.CreateParameter("message", logMessage));
-
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    //Are we not in a loop here
-                    m_log.Error("[LOG DB] Error logging : " + e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the name of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider name</returns>
-        public string Name
-        {
-            get { return "MSSQL Logdata Interface"; }
-        }
-
-        /// <summary>
-        /// Closes the database provider
-        /// </summary>
-        public void Dispose()
-        {
-            database = null;
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the provider version</returns>
-        public string Version
-        {
-            get { return "0.1"; }
-        }
-    }
-}
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 3d7a768..575fd21 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -48,21 +48,6 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         private readonly string connectionString;
 
-        public MSSQLManager(string dataSource, string initialCatalog, string persistSecurityInfo, string userId,
-                            string password)
-        {
-            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder();
-
-            builder.DataSource = dataSource;
-            builder.InitialCatalog = initialCatalog;
-            builder.PersistSecurityInfo = Convert.ToBoolean(persistSecurityInfo);
-            builder.UserID = userId;
-            builder.Password = password;
-            builder.ApplicationName = Assembly.GetEntryAssembly().Location;
-
-            connectionString = builder.ToString();
-        }
-
         /// <summary>
         /// Initialize the manager and set the connectionstring
         /// </summary>
@@ -72,94 +57,6 @@ namespace OpenSim.Data.MSSQL
             connectionString = connection;
         }
 
-        public SqlConnection DatabaseConnection()
-        {
-            SqlConnection conn = new SqlConnection(connectionString);
-
-            //TODO is this good??? Opening connection here
-            conn.Open();
-
-            return conn;
-        }
-
-        #region Obsolete functions, can be removed!
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <param name="name"></param>
-        /// <param name="type"></param>
-        [Obsolete("Do not use!")]
-        protected static void createCol(DataTable dt, string name, Type type)
-        {
-            DataColumn col = new DataColumn(name, type);
-            dt.Columns.Add(col);
-        }
-
-        /// <summary>
-        /// Define Table function
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <returns></returns>
-/*
-        [Obsolete("Do not use!")]
-        protected static string defineTable(DataTable dt)
-        {
-            string sql = "create table " + dt.TableName + "(";
-            string subsql = String.Empty;
-            foreach (DataColumn col in dt.Columns)
-            {
-                if (subsql.Length > 0)
-                {
-                    // a map function would rock so much here
-                    subsql += ",\n";
-                }
-
-                subsql += col.ColumnName + " " + SqlType(col.DataType);
-                if (col == dt.PrimaryKey[0])
-                {
-                    subsql += " primary key";
-                }
-            }
-            sql += subsql;
-            sql += ")";
-            return sql;
-        }
-*/
-
-        #endregion
-
-        /// <summary>
-        /// Type conversion function
-        /// </summary>
-        /// <param name="type">a type</param>
-        /// <returns>a sqltype</returns>
-        /// <remarks>this is something we'll need to implement for each db slightly differently.</remarks>
-/*
-        [Obsolete("Used by a obsolete methods")]
-        public static string SqlType(Type type)
-        {
-            if (type == typeof(String))
-            {
-                return "varchar(255)";
-            }
-            if (type == typeof(Int32))
-            {
-                return "integer";
-            }
-            if (type == typeof(Double))
-            {
-                return "float";
-            }
-            if (type == typeof(Byte[]))
-            {
-                return "image";
-            }
-            return "varchar(255)";
-        }
-*/
-
         /// <summary>
         /// Type conversion to a SQLDbType functions
         /// </summary>
@@ -286,135 +183,21 @@ namespace OpenSim.Data.MSSQL
         private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>();
 
         /// <summary>
-        /// Run a query and return a sql db command
-        /// </summary>
-        /// <param name="sql">The SQL query.</param>
-        /// <returns></returns>
-        internal AutoClosingSqlCommand Query(string sql)
-        {
-            return Query(sql, emptyDictionary);
-        }
-
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A Sql DB Command</returns>
-        internal AutoClosingSqlCommand Query(string sql, Dictionary<string, string> parameters)
-        {
-            SqlCommand dbcommand = DatabaseConnection().CreateCommand();
-            dbcommand.CommandText = sql;
-            foreach (KeyValuePair<string, string> param in parameters)
-            {
-                dbcommand.Parameters.AddWithValue(param.Key, param.Value);
-            }
-
-            return new AutoClosingSqlCommand(dbcommand);
-        }
-
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="sqlParameter">A parameter - use createparameter to create parameter</param>
-        /// <returns></returns>
-        internal AutoClosingSqlCommand Query(string sql, SqlParameter sqlParameter)
-        {
-            SqlCommand dbcommand = DatabaseConnection().CreateCommand();
-            dbcommand.CommandText = sql;
-            dbcommand.Parameters.Add(sqlParameter);
-
-            return new AutoClosingSqlCommand(dbcommand);
-        }
-
-        /// <summary>
         /// Checks if we need to do some migrations to the database
         /// </summary>
         /// <param name="migrationStore">migrationStore.</param>
         public void CheckMigration(string migrationStore)
         {
-            using (SqlConnection connection = DatabaseConnection())
+            using (SqlConnection connection = new SqlConnection(connectionString)) 
             {
+                connection.Open();
                 Assembly assem = GetType().Assembly;
                 MSSQLMigration migration = new MSSQLMigration(connection, assem, migrationStore);
 
                 migration.Update();
-
-                connection.Close();
             }
         }
 
-        #region Old Testtable functions
-
-        /// <summary>
-        /// Execute a SQL statement stored in a resource, as a string
-        /// </summary>
-        /// <param name="name">the ressource string</param>
-        public void ExecuteResourceSql(string name)
-        {
-            using (IDbCommand cmd = Query(getResourceString(name), new Dictionary<string, string>()))
-            {
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Given a list of tables, return the version of the tables, as seen in the database
-        /// </summary>
-        /// <param name="tableList"></param>
-        public void GetTableVersion(Dictionary<string, string> tableList)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["dbname"] = new SqlConnectionStringBuilder(connectionString).InitialCatalog;
-
-            using (IDbCommand tablesCmd =
-                Query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_CATALOG=@dbname", param))
-            using (IDataReader tables = tablesCmd.ExecuteReader())
-            {
-                while (tables.Read())
-                {
-                    try
-                    {
-                        string tableName = (string)tables["TABLE_NAME"];
-                        if (tableList.ContainsKey(tableName))
-                            tableList[tableName] = tableName;
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error(e.ToString());
-                    }
-                }
-                tables.Close();
-            }
-
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        private string getResourceString(string name)
-        {
-            Assembly assem = GetType().Assembly;
-            string[] names = assem.GetManifestResourceNames();
-
-            foreach (string s in names)
-                if (s.EndsWith(name))
-                    using (Stream resource = assem.GetManifestResourceStream(s))
-                    {
-                        using (StreamReader resourceReader = new StreamReader(resource))
-                        {
-                            string resourceString = resourceReader.ReadToEnd();
-                            return resourceString;
-                        }
-                    }
-            throw new Exception(string.Format("Resource '{0}' was not found", name));
-        }
-
-        #endregion
-
         /// <summary>
         /// Returns the version of this DB provider
         /// </summary>
diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
new file mode 100644
index 0000000..5a4ad3a
--- /dev/null
+++ b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Data.SqlClient;
+
+namespace OpenSim.Data.MSSQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Presence Server
+    /// </summary>
+    public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
+            IPresenceData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public MSSQLPresenceData(string connectionString, string realm) :
+                base(connectionString, realm, "Presence")
+        {
+        }
+
+        public PresenceData Get(UUID sessionID)
+        {
+            PresenceData[] ret = Get("SessionID",
+                    sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format("UPDATE {0} SET Online='false' WHERE [RegionID]=@RegionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+            }
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, string position,
+                string lookAt)
+        {
+            PresenceData[] pd = Get("SessionID", sessionID.ToString());
+            if (pd.Length == 0)
+                return false;
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format(@"UPDATE {0} SET 
+                                                [RegionID] = @RegionID, 
+                                                [Position] = @Position, 
+                                                [LookAt] = @LookAt, 
+                                                [Online] = 'true'
+                                        WHERE [SessionID] = @SessionID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("@SessionID", sessionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@Position", position.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@LookAt", lookAt.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() == 0)
+                    return false;
+            }
+            return true;
+        }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            PresenceData[] pd = Get("UserID", userID);
+            if (pd.Length == 0)
+                return false;
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format(@"UPDATE {0} SET 
+                                                [HomeRegionID] = @HomeRegionID, 
+                                                [HomePosition] = @HomePosition, 
+                                                [HomeLookAt] = @HomeLookAt 
+                                            WHERE [UserID] = @UserID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("@UserID", userID));
+                cmd.Parameters.Add(m_database.CreateParameter("@HomeRegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@HomePosition", position));
+                cmd.Parameters.Add(m_database.CreateParameter("@HomeLookAt", lookAt));
+                cmd.Connection = conn;
+                conn.Open();
+                if (cmd.ExecuteNonQuery() == 0)
+                    return false;
+            }
+            return true;
+        }
+
+        public void Prune(string userID)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+                cmd.CommandText = String.Format("SELECT * from {0} WHERE [UserID] = @UserID", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("@UserID", userID));
+                cmd.Connection = conn;
+                conn.Open();
+
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+                    List<UUID> deleteSessions = new List<UUID>();
+                    int online = 0;
+
+                    while (reader.Read())
+                    {
+                        if (bool.Parse(reader["Online"].ToString()))
+                            online++;
+                        else
+                            deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
+                    }
+
+                    if (online == 0 && deleteSessions.Count > 0)
+                        deleteSessions.RemoveAt(0);
+
+                    foreach (UUID s in deleteSessions)
+                        Delete("SessionID", s.ToString());
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index a898aab..66c3f81 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -129,10 +129,10 @@ namespace OpenSim.Data.MSSQL
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("@startX", startX.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@startY", startY.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@endX", endX.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@endY", endY.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@startX", startX));
+                cmd.Parameters.Add(m_database.CreateParameter("@startY", startY));
+                cmd.Parameters.Add(m_database.CreateParameter("@endX", endX));
+                cmd.Parameters.Add(m_database.CreateParameter("@endY", endY));
                 cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
                 conn.Open();
                 return RunCommand(cmd);
@@ -307,5 +307,37 @@ namespace OpenSim.Data.MSSQL
             }
             return false;
         }
+
+        public List<RegionData> GetDefaultRegions(UUID scopeID)
+        {
+            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 1) <> 0";
+            if (scopeID != UUID.Zero)
+                sql += " AND ScopeID = @scopeID";
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                conn.Open();
+                return RunCommand(cmd);
+            }
+            
+        }
+
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 2) <> 0";
+            if (scopeID != UUID.Zero)
+                sql += " AND ScopeID = @scopeID";
+
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            {
+                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                conn.Open();
+                // TODO: distance-sort results
+                return RunCommand(cmd);
+            }
+        }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 2d92cb1..e7c8dc5 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -36,153 +36,207 @@ using System.Text;
 
 namespace OpenSim.Data.MSSQL
 {
-    public class MSSQLUserAccountData : IUserAccountData
+    public class MSSQLUserAccountData : MSSQLGenericTableHandler<UserAccountData>,IUserAccountData
     {
-        private string m_Realm;
-        private List<string> m_ColumnNames = null;
-        private string m_ConnectionString;
-        private MSSQLManager m_database;
-
-        public MSSQLUserAccountData(string connectionString, string realm)
-        {
-            m_Realm = realm;
-            m_ConnectionString = connectionString;
-            m_database = new MSSQLManager(connectionString);
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            {
-                conn.Open();
-                Migration m = new Migration(conn, GetType().Assembly, "UserStore");
-                m.Update();
-            }
-        }
-
-        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+        public MSSQLUserAccountData(string connectionString, string realm) :
+            base(connectionString, realm, "UserAccount")
         {
-            return null;
         }
-
-        public UserAccountData Get(UUID principalID, UUID scopeID)
+        //private string m_Realm;
+        //private List<string> m_ColumnNames = null;
+        //private MSSQLManager m_database;
+
+        //public MSSQLUserAccountData(string connectionString, string realm)
+        //{
+        //    m_Realm = realm;
+        //    m_ConnectionString = connectionString;
+        //    m_database = new MSSQLManager(connectionString);
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    {
+        //        conn.Open();
+        //        Migration m = new Migration(conn, GetType().Assembly, "UserStore");
+        //        m.Update();
+        //    }
+        //}
+
+        //public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+        //{
+        //    return null;
+        //}
+
+        //public UserAccountData Get(UUID principalID, UUID scopeID)
+        //{
+        //    UserAccountData ret = new UserAccountData();
+        //    ret.Data = new Dictionary<string, string>();
+
+        //    string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
+        //    if (scopeID != UUID.Zero)
+        //        sql += " and ScopeID = @scopeID";
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
+        //    {
+        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                
+        //        conn.Open();
+        //        using (SqlDataReader result = cmd.ExecuteReader())
+        //        {
+        //            if (result.Read())
+        //            {
+        //                ret.PrincipalID = principalID;
+        //                UUID scope;
+        //                UUID.TryParse(result["ScopeID"].ToString(), out scope);
+        //                ret.ScopeID = scope;
+
+        //                if (m_ColumnNames == null)
+        //                {
+        //                    m_ColumnNames = new List<string>();
+
+        //                    DataTable schemaTable = result.GetSchemaTable();
+        //                    foreach (DataRow row in schemaTable.Rows)
+        //                        m_ColumnNames.Add(row["ColumnName"].ToString());
+        //                }
+
+        //                foreach (string s in m_ColumnNames)
+        //                {
+        //                    if (s == "UUID")
+        //                        continue;
+        //                    if (s == "ScopeID")
+        //                        continue;
+
+        //                    ret.Data[s] = result[s].ToString();
+        //                }
+        //                return ret;
+        //            }
+        //        }
+        //    }
+        //    return null;
+        //}
+
+        //public bool Store(UserAccountData data)
+        //{
+        //    if (data.Data.ContainsKey("UUID"))
+        //        data.Data.Remove("UUID");
+        //    if (data.Data.ContainsKey("ScopeID"))
+        //        data.Data.Remove("ScopeID");
+
+        //    string[] fields = new List<string>(data.Data.Keys).ToArray();
+
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand())
+        //    {
+        //        StringBuilder updateBuilder = new StringBuilder();
+        //        updateBuilder.AppendFormat("update {0} set ", m_Realm);
+        //        bool first = true;
+        //        foreach (string field in fields)
+        //        {
+        //            if (!first)
+        //                updateBuilder.Append(", ");
+        //            updateBuilder.AppendFormat("{0} = @{0}", field);
+
+        //            first = false;
+        //            cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+        //        }
+
+        //        updateBuilder.Append(" where UUID = @principalID");
+
+        //        if (data.ScopeID != UUID.Zero)
+        //            updateBuilder.Append(" and ScopeID = @scopeID");
+
+        //        cmd.CommandText = updateBuilder.ToString();
+        //        cmd.Connection = conn;
+        //        cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
+        //        conn.Open();
+
+        //        if (cmd.ExecuteNonQuery() < 1)
+        //        {
+        //            StringBuilder insertBuilder = new StringBuilder();
+        //            insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
+        //            insertBuilder.Append(String.Join(", ", fields));
+        //            insertBuilder.Append(") values (@principalID, @scopeID, @");
+        //            insertBuilder.Append(String.Join(", @", fields));
+        //            insertBuilder.Append(")");
+
+        //            cmd.CommandText = insertBuilder.ToString();
+
+        //            if (cmd.ExecuteNonQuery() < 1)
+        //            {
+        //                return false;
+        //            }
+        //        }
+        //    }
+        //    return true;
+        //}
+
+        //public bool Store(UserAccountData data, UUID principalID, string token)
+        //{
+        //    return false;
+        //}
+
+        //public bool SetDataItem(UUID principalID, string item, string value)
+        //{
+        //    string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
+        //    using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+        //    using (SqlCommand cmd = new SqlCommand(sql, conn))
+        //    {
+        //        cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
+        //        cmd.Parameters.Add(m_database.CreateParameter("@UUID", principalID));
+
+        //        conn.Open();
+
+        //        if (cmd.ExecuteNonQuery() > 0)
+        //            return true;
+        //    }
+        //    return false;
+        //}
+
+        //public UserAccountData[] Get(string[] keys, string[] vals)
+        //{
+        //    return null;
+        //}
+
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
         {
-            UserAccountData ret = new UserAccountData();
-            ret.Data = new Dictionary<string, object>();
-
-            string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
-            if (scopeID != UUID.Zero)
-                sql += " and ScopeID = @scopeID";
+            string[] words = query.Split(new char[] { ' ' });
 
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            for (int i = 0; i < words.Length; i++)
             {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                
-                conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
+                if (words[i].Length < 3)
                 {
-                    if (result.Read())
-                    {
-                        ret.PrincipalID = principalID;
-                        UUID scope;
-                        UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                        ret.ScopeID = scope;
-
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
-
-                            DataTable schemaTable = result.GetSchemaTable();
-                            foreach (DataRow row in schemaTable.Rows)
-                                m_ColumnNames.Add(row["ColumnName"].ToString());
-                        }
-
-                        foreach (string s in m_ColumnNames)
-                        {
-                            if (s == "UUID")
-                                continue;
-                            if (s == "ScopeID")
-                                continue;
-
-                            ret.Data[s] = result[s].ToString();
-                        }
-                        return ret;
-                    }
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
                 }
             }
-            return null;
-        }
 
-        public bool Store(UserAccountData data)
-        {
-            if (data.Data.ContainsKey("UUID"))
-                data.Data.Remove("UUID");
-            if (data.Data.ContainsKey("ScopeID"))
-                data.Data.Remove("ScopeID");
+            if (words.Length == 0)
+                return new UserAccountData[0];
 
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
+            if (words.Length > 2)
+                return new UserAccountData[0];
 
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             using (SqlCommand cmd = new SqlCommand())
             {
-                StringBuilder updateBuilder = new StringBuilder();
-                updateBuilder.AppendFormat("update {0} set ", m_Realm);
-                bool first = true;
-                foreach (string field in fields)
+                if (words.Length == 1)
                 {
-                    if (!first)
-                        updateBuilder.Append(", ");
-                    updateBuilder.AppendFormat("{0} = @{0}", field);
-
-                    first = false;
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @search or [LastName] like @search)", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
+                     cmd.Parameters.Add(m_database.CreateParameter("@search", "%" + words[0] + "%"));
                 }
-
-                updateBuilder.Append(" where UUID = @principalID");
-
-                if (data.ScopeID != UUID.Zero)
-                    updateBuilder.Append(" and ScopeID = @scopeID");
-
-                cmd.CommandText = updateBuilder.ToString();
-                cmd.Connection = conn;
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", data.ScopeID));
-                conn.Open();
-
-                if (cmd.ExecuteNonQuery() < 1)
+                else
                 {
-                    StringBuilder insertBuilder = new StringBuilder();
-                    insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
-                    insertBuilder.Append(String.Join(", ", fields));
-                    insertBuilder.Append(") values (@principalID, @scopeID, @");
-                    insertBuilder.Append(String.Join(", @", fields));
-                    insertBuilder.Append(")");
-
-                    cmd.CommandText = insertBuilder.ToString();
-
-                    if (cmd.ExecuteNonQuery() < 1)
-                    {
-                        return false;
-                    }
+                    cmd.CommandText = String.Format("select * from {0} where ([ScopeID]=@ScopeID or [ScopeID]='00000000-0000-0000-0000-000000000000') and ([FirstName] like @searchFirst or [LastName] like @searchLast)", m_Realm);
+                     cmd.Parameters.Add(m_database.CreateParameter("@searchFirst", "%" + words[0] + "%"));
+                     cmd.Parameters.Add(m_database.CreateParameter("@searchLast", "%" + words[1] + "%"));
+                     cmd.Parameters.Add(m_database.CreateParameter("@ScopeID", scopeID.ToString()));
                 }
-            }
-            return true;
-        }
-
-        public bool SetDataItem(UUID principalID, string item, string value)
-        {
-            string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
-                cmd.Parameters.Add(m_database.CreateParameter("@UUID", principalID));
-
-                conn.Open();
 
-                if (cmd.ExecuteNonQuery() > 0)
-                    return true;
+                return DoQuery(cmd);
             }
-            return false;
         }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
deleted file mode 100644
index 3ef1053..0000000
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ /dev/null
@@ -1,1214 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MSSQL
-{
-    /// <summary>
-    /// A database interface class to a user profile storage system
-    /// </summary>
-    public class MSSQLUserData : UserDataBase
-    {
-        private const string _migrationStore = "UserStore";
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Database manager for MSSQL
-        /// </summary>
-        public MSSQLManager database;
-
-        private const string m_agentsTableName = "agents";
-        private const string m_usersTableName = "users";
-        private const string m_userFriendsTableName = "userfriends";
-
-        // [Obsolete("Cannot be default-initialized!")]
-        override public void Initialise()
-        {
-            m_log.Info("[MSSQLUserData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// Loads and initialises the MSSQL storage plugin
-        /// </summary>
-        /// <param name="connect">connectionstring</param>
-        /// <remarks>use mssql_connection.ini</remarks>
-        override public void Initialise(string connect)
-        {
-            if (!string.IsNullOrEmpty(connect))
-            {
-                database = new MSSQLManager(connect);
-            }
-            else
-            {
-                IniFile iniFile = new IniFile("mssql_connection.ini");
-
-                string settingDataSource = iniFile.ParseFileReadValue("data_source");
-                string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog");
-                string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info");
-                string settingUserId = iniFile.ParseFileReadValue("user_id");
-                string settingPassword = iniFile.ParseFileReadValue("password");
-
-                database = new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId, settingPassword);
-            }
-
-            //Check migration on DB
-            database.CheckMigration(_migrationStore);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources
-        /// </summary>
-        override public void Dispose() { }
-
-        #region User table methods
-
-        /// <summary>
-        /// Searches the database for a specified user profile by name components
-        /// </summary>
-        /// <param name="user">The first part of the account name</param>
-        /// <param name="last">The second part of the account name</param>
-        /// <returns>A user profile</returns>
-        override public UserProfileData GetUserByName(string user, string last)
-        {
-            string sql = string.Format(@"SELECT * FROM {0} 
-                                         WHERE username = @first AND lastname = @second", m_usersTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("first", user));
-                command.Parameters.Add(database.CreateParameter("second", last));
-                try
-                {
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        return ReadUserRow(reader);
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error getting user profile for {0} {1}: {2}", user, last, e.Message);
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// See IUserDataPlugin
-        /// </summary>
-        /// <param name="uuid"></param>
-        /// <returns></returns>
-        override public UserProfileData GetUserByUUID(UUID uuid)
-        {
-            string sql = string.Format("SELECT * FROM {0} WHERE UUID = @uuid", m_usersTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", uuid));
-                try
-                {
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        return ReadUserRow(reader);
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error getting user profile by UUID {0}, error: {1}", uuid, e.Message);
-                    return null;
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// Creates a new users profile
-        /// </summary>
-        /// <param name="user">The user profile to create</param>
-        override public void AddNewUserProfile(UserProfileData user)
-        {
-            try
-            {
-                InsertUserRow(user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
-                              user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
-                              user.HomeLocation.Z,
-                              user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
-                              user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
-                              user.CanDoMask, user.WantDoMask,
-                              user.AboutText, user.FirstLifeAboutText, user.Image,
-                              user.FirstLifeImage, user.WebLoginKey, user.HomeRegionID,
-                              user.GodLevel, user.UserFlags, user.CustomType, user.Partner);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[USER DB] Error adding new profile, error: {0}", e.Message);
-            }
-        }
-
-        /// <summary>
-        /// update a user profile
-        /// </summary>
-        /// <param name="user">the profile to update</param>
-        /// <returns></returns>
-        override public bool UpdateUserProfile(UserProfileData user)
-        {
-            string sql = string.Format(@"UPDATE {0} 
-                                        SET UUID = @uuid,
-                                        username = @username, 
-                                        lastname = @lastname,
-                                        email = @email,
-                                        passwordHash = @passwordHash,
-                                        passwordSalt = @passwordSalt,
-                                        homeRegion = @homeRegion,
-                                        homeLocationX = @homeLocationX,
-                                        homeLocationY = @homeLocationY,
-                                        homeLocationZ = @homeLocationZ,
-                                        homeLookAtX = @homeLookAtX,
-                                        homeLookAtY = @homeLookAtY,
-                                        homeLookAtZ = @homeLookAtZ,
-                                        created = @created,
-                                        lastLogin = @lastLogin,
-                                        userInventoryURI = @userInventoryURI,
-                                        userAssetURI = @userAssetURI,
-                                        profileCanDoMask = @profileCanDoMask,
-                                        profileWantDoMask = @profileWantDoMask,
-                                        profileAboutText = @profileAboutText,
-                                        profileFirstText = @profileFirstText,
-                                        profileImage = @profileImage,
-                                        profileFirstImage = @profileFirstImage, 
-                                        webLoginKey = @webLoginKey, 
-                                        homeRegionID = @homeRegionID,
-                                        userFlags = @userFlags,
-                                        godLevel = @godLevel, 
-                                        customType = @customType, 
-                                        partner = @partner WHERE UUID = @keyUUUID;",m_usersTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", user.ID));
-                command.Parameters.Add(database.CreateParameter("username", user.FirstName));
-                command.Parameters.Add(database.CreateParameter("lastname", user.SurName));
-                command.Parameters.Add(database.CreateParameter("email", user.Email));
-                command.Parameters.Add(database.CreateParameter("passwordHash", user.PasswordHash));
-                command.Parameters.Add(database.CreateParameter("passwordSalt", user.PasswordSalt));
-                command.Parameters.Add(database.CreateParameter("homeRegion", user.HomeRegion));
-                command.Parameters.Add(database.CreateParameter("homeLocationX", user.HomeLocation.X));
-                command.Parameters.Add(database.CreateParameter("homeLocationY", user.HomeLocation.Y));
-                command.Parameters.Add(database.CreateParameter("homeLocationZ", user.HomeLocation.Z));
-                command.Parameters.Add(database.CreateParameter("homeLookAtX", user.HomeLookAt.X));
-                command.Parameters.Add(database.CreateParameter("homeLookAtY", user.HomeLookAt.Y));
-                command.Parameters.Add(database.CreateParameter("homeLookAtZ", user.HomeLookAt.Z));
-                command.Parameters.Add(database.CreateParameter("created", user.Created));
-                command.Parameters.Add(database.CreateParameter("lastLogin", user.LastLogin));
-                command.Parameters.Add(database.CreateParameter("userInventoryURI", user.UserInventoryURI));
-                command.Parameters.Add(database.CreateParameter("userAssetURI", user.UserAssetURI));
-                command.Parameters.Add(database.CreateParameter("profileCanDoMask", user.CanDoMask));
-                command.Parameters.Add(database.CreateParameter("profileWantDoMask", user.WantDoMask));
-                command.Parameters.Add(database.CreateParameter("profileAboutText", user.AboutText));
-                command.Parameters.Add(database.CreateParameter("profileFirstText", user.FirstLifeAboutText));
-                command.Parameters.Add(database.CreateParameter("profileImage", user.Image));
-                command.Parameters.Add(database.CreateParameter("profileFirstImage", user.FirstLifeImage));
-                command.Parameters.Add(database.CreateParameter("webLoginKey", user.WebLoginKey));
-                command.Parameters.Add(database.CreateParameter("homeRegionID", user.HomeRegionID));
-                command.Parameters.Add(database.CreateParameter("userFlags", user.UserFlags));
-                command.Parameters.Add(database.CreateParameter("godLevel", user.GodLevel));
-                command.Parameters.Add(database.CreateParameter("customType", user.CustomType));
-                command.Parameters.Add(database.CreateParameter("partner", user.Partner));
-                command.Parameters.Add(database.CreateParameter("keyUUUID", user.ID));
-
-                try
-                {
-                    int affected = command.ExecuteNonQuery();
-                    return (affected != 0);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error updating profile, error: {0}", e.Message);
-                }
-            }
-            return false;
-        }
-
-        #endregion
-
-        #region Agent table methods
-
-        /// <summary>
-        /// Returns a user session searching by name
-        /// </summary>
-        /// <param name="name">The account name</param>
-        /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByName(string name)
-        {
-            return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-
-        /// <summary>
-        /// Returns a user session by account name
-        /// </summary>
-        /// <param name="user">First part of the users account name</param>
-        /// <param name="last">Second part of the users account name</param>
-        /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByName(string user, string last)
-        {
-            UserProfileData profile = GetUserByName(user, last);
-            return GetAgentByUUID(profile.ID);
-        }
-
-        /// <summary>
-        /// Returns an agent session by account UUID
-        /// </summary>
-        /// <param name="uuid">The accounts UUID</param>
-        /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByUUID(UUID uuid)
-        {
-            string sql = string.Format("SELECT * FROM {0} WHERE UUID = @uuid", m_agentsTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", uuid));
-                try
-                {
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        return readAgentRow(reader);
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error updating agentdata by UUID, error: {0}", e.Message);
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a new agent
-        /// </summary>
-        /// <param name="agent">The agent to create</param>
-        override public void AddNewUserAgent(UserAgentData agent)
-        {
-            try
-            {
-                InsertUpdateAgentRow(agent);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[USER DB] Error adding new agentdata, error: {0}", e.Message);
-            }
-        }
-
-        #endregion
-
-        #region User Friends List Data
-
-        /// <summary>
-        /// Add a new friend in the friendlist
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">Friend's UUID</param>
-        /// <param name="perms">Permission flag</param>
-        override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            int dtvalue = Util.UnixTimeSinceEpoch();
-            string sql = string.Format(@"INSERT INTO {0}
-                                            (ownerID,friendID,friendPerms,datetimestamp) 
-                                         VALUES
-                                            (@ownerID,@friendID,@friendPerms,@datetimestamp)", m_userFriendsTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("ownerID", friendlistowner));
-                command.Parameters.Add(database.CreateParameter("friendID", friend));
-                command.Parameters.Add(database.CreateParameter("friendPerms", perms));
-                command.Parameters.Add(database.CreateParameter("datetimestamp", dtvalue));
-                command.ExecuteNonQuery();
-
-                try
-                {
-                    sql = string.Format(@"INSERT INTO {0}
-                                            (ownerID,friendID,friendPerms,datetimestamp) 
-                                          VALUES 
-                                            (@friendID,@ownerID,@friendPerms,@datetimestamp)", m_userFriendsTableName);
-                    command.CommandText = sql;
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error adding new userfriend, error: {0}", e.Message);
-                    return;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Remove an friend from the friendlist
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">UUID of the not-so-friendly user to remove from the list</param>
-        override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            string sql = string.Format(@"DELETE from {0} 
-                                         WHERE ownerID = @ownerID 
-                                            AND friendID = @friendID", m_userFriendsTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
-                command.Parameters.Add(database.CreateParameter("@friendID", friend));
-                command.ExecuteNonQuery();
-                sql = string.Format(@"DELETE from {0} 
-                                         WHERE ownerID = @friendID 
-                                            AND friendID = @ownerID", m_userFriendsTableName);
-                command.CommandText = sql;
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error removing userfriend, error: {0}", e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Update friendlist permission flag for a friend
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">UUID of the friend</param>
-        /// <param name="perms">new permission flag</param>
-        override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            string sql = string.Format(@"UPDATE {0} SET friendPerms = @friendPerms 
-                                         WHERE ownerID = @ownerID 
-                                            AND friendID = @friendID", m_userFriendsTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
-                command.Parameters.Add(database.CreateParameter("@friendID", friend));
-                command.Parameters.Add(database.CreateParameter("@friendPerms", perms));
-
-                try
-                {
-                    command.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error updating userfriend, error: {0}", e.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get (fetch?) the user's friendlist
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <returns>Friendlist list</returns>
-        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            List<FriendListItem> friendList = new List<FriendListItem>();
-
-            //Left Join userfriends to itself
-            string sql = string.Format(@"SELECT a.ownerID, a.friendID, a.friendPerms, b.friendPerms AS ownerperms 
-                                        FROM {0} as a, {0} as b
-                                        WHERE a.ownerID = @ownerID 
-                                        AND b.ownerID = a.friendID 
-                                        AND b.friendID = a.ownerID", m_userFriendsTableName);
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
-                try
-                {
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            FriendListItem fli = new FriendListItem();
-                            fli.FriendListOwner = new UUID((Guid)reader["ownerID"]);
-                            fli.Friend = new UUID((Guid)reader["friendID"]);
-                            fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]);
-
-                            // This is not a real column in the database table, it's a joined column from the opposite record
-                            fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]);
-                            friendList.Add(fli);
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error updating userfriend, error: {0}", e.Message);
-                }
-            }
-            return friendList;
-        }
-
-        override public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
-        {
-            Dictionary<UUID, FriendRegionInfo> infos = new Dictionary<UUID,FriendRegionInfo>(); 
-            try
-            {
-                foreach (UUID uuid in uuids)
-                {
-                    string sql = string.Format(@"SELECT agentOnline,currentHandle 
-                                                 FROM {0} WHERE UUID = @uuid", m_agentsTableName);
-                    using (AutoClosingSqlCommand command = database.Query(sql))
-                    {
-                        command.Parameters.Add(database.CreateParameter("@uuid", uuid));
-                        using (SqlDataReader reader = command.ExecuteReader())
-                        {
-                            while (reader.Read())
-                            {
-                                FriendRegionInfo fri = new FriendRegionInfo();
-                                fri.isOnline = (byte)reader["agentOnline"] != 0;
-                                fri.regionHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
-
-                                infos[uuid] = fri;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[MSSQL]: Got exception on trying to find friends regions:", e);
-            }
-
-            return infos;
-        }
-        #endregion
-
-        #region Money functions (not used)
-
-        /// <summary>
-        /// Performs a money transfer request between two accounts
-        /// </summary>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The receivers account ID</param>
-        /// <param name="amount">The amount to transfer</param>
-        /// <returns>false</returns>
-        override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Performs an inventory transfer request between two accounts
-        /// </summary>
-        /// <remarks>TODO: Move to inventory server</remarks>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The receivers account ID</param>
-        /// <param name="item">The item to transfer</param>
-        /// <returns>false</returns>
-        override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
-        {
-            return false;
-        }
-
-        #endregion
-
-        #region Appearance methods
-
-        /// <summary>
-        /// Gets the user appearance.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <returns></returns>
-        override public AvatarAppearance GetUserAppearance(UUID user)
-        {
-            try
-            {
-                AvatarAppearance appearance = new AvatarAppearance();
-                string sql = "SELECT * FROM avatarappearance WHERE owner = @UUID";
-                using (AutoClosingSqlCommand command = database.Query(sql))
-                {
-                    command.Parameters.Add(database.CreateParameter("@UUID", user));
-                    using (SqlDataReader reader = command.ExecuteReader())
-                    {
-                        if (reader.Read())
-                            appearance = readUserAppearance(reader);
-                        else
-                        {
-                            m_log.WarnFormat("[USER DB] No appearance found for user {0}", user.ToString());
-                            return null;
-                        }
-
-                    }
-                }
-
-                appearance.SetAttachments(GetUserAttachments(user));
-
-                return appearance;
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[USER DB] Error updating userfriend, error: {0}", e.Message);
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Update a user appearence into database
-        /// </summary>
-        /// <param name="user">the used UUID</param>
-        /// <param name="appearance">the appearence</param>
-        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
-        {
-            string sql = @"DELETE FROM avatarappearance WHERE owner=@owner; 
-                        INSERT INTO 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) 
-                        VALUES
-                           (@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)";
-
-            using (AutoClosingSqlCommand cmd = database.Query(sql))
-            {
-                cmd.Parameters.Add(database.CreateParameter("@owner", appearance.Owner));
-                cmd.Parameters.Add(database.CreateParameter("@serial", appearance.Serial));
-                cmd.Parameters.Add(database.CreateParameter("@visual_params", appearance.VisualParams));
-                cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.GetBytes()));
-                cmd.Parameters.Add(database.CreateParameter("@avatar_height", appearance.AvatarHeight));
-                cmd.Parameters.Add(database.CreateParameter("@body_item", appearance.BodyItem));
-                cmd.Parameters.Add(database.CreateParameter("@body_asset", appearance.BodyAsset));
-                cmd.Parameters.Add(database.CreateParameter("@skin_item", appearance.SkinItem));
-                cmd.Parameters.Add(database.CreateParameter("@skin_asset", appearance.SkinAsset));
-                cmd.Parameters.Add(database.CreateParameter("@hair_item", appearance.HairItem));
-                cmd.Parameters.Add(database.CreateParameter("@hair_asset", appearance.HairAsset));
-                cmd.Parameters.Add(database.CreateParameter("@eyes_item", appearance.EyesItem));
-                cmd.Parameters.Add(database.CreateParameter("@eyes_asset", appearance.EyesAsset));
-                cmd.Parameters.Add(database.CreateParameter("@shirt_item", appearance.ShirtItem));
-                cmd.Parameters.Add(database.CreateParameter("@shirt_asset", appearance.ShirtAsset));
-                cmd.Parameters.Add(database.CreateParameter("@pants_item", appearance.PantsItem));
-                cmd.Parameters.Add(database.CreateParameter("@pants_asset", appearance.PantsAsset));
-                cmd.Parameters.Add(database.CreateParameter("@shoes_item", appearance.ShoesItem));
-                cmd.Parameters.Add(database.CreateParameter("@shoes_asset", appearance.ShoesAsset));
-                cmd.Parameters.Add(database.CreateParameter("@socks_item", appearance.SocksItem));
-                cmd.Parameters.Add(database.CreateParameter("@socks_asset", appearance.SocksAsset));
-                cmd.Parameters.Add(database.CreateParameter("@jacket_item", appearance.JacketItem));
-                cmd.Parameters.Add(database.CreateParameter("@jacket_asset", appearance.JacketAsset));
-                cmd.Parameters.Add(database.CreateParameter("@gloves_item", appearance.GlovesItem));
-                cmd.Parameters.Add(database.CreateParameter("@gloves_asset", appearance.GlovesAsset));
-                cmd.Parameters.Add(database.CreateParameter("@undershirt_item", appearance.UnderShirtItem));
-                cmd.Parameters.Add(database.CreateParameter("@undershirt_asset", appearance.UnderShirtAsset));
-                cmd.Parameters.Add(database.CreateParameter("@underpants_item", appearance.UnderPantsItem));
-                cmd.Parameters.Add(database.CreateParameter("@underpants_asset", appearance.UnderPantsAsset));
-                cmd.Parameters.Add(database.CreateParameter("@skirt_item", appearance.SkirtItem));
-                cmd.Parameters.Add(database.CreateParameter("@skirt_asset", appearance.SkirtAsset));
-
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[USER DB] Error updating user appearance, error: {0}", e.Message);
-                }
-            }
-            UpdateUserAttachments(user, appearance.GetAttachments());
-        }
-
-        #endregion
-
-        #region Attachment methods
-
-        /// <summary>
-        /// Gets all attachment of a agent.
-        /// </summary>
-        /// <param name="agentID">agent ID.</param>
-        /// <returns></returns>
-        public Hashtable GetUserAttachments(UUID agentID)
-        {
-            Hashtable returnTable = new Hashtable();
-            string sql = "select attachpoint, item, asset from avatarattachments where UUID = @uuid";
-            using (AutoClosingSqlCommand command = database.Query(sql, database.CreateParameter("@uuid", agentID)))
-            {
-                using (SqlDataReader reader = command.ExecuteReader())
-                {
-                    while (reader.Read())
-                    {
-                        int attachpoint = Convert.ToInt32(reader["attachpoint"]);
-                        if (returnTable.ContainsKey(attachpoint))
-                            continue;
-                        Hashtable item = new Hashtable();
-                        item.Add("item", reader["item"].ToString());
-                        item.Add("asset", reader["asset"].ToString());
-
-                        returnTable.Add(attachpoint, item);
-                    }
-                }
-            }
-            return returnTable;
-        }
-
-        /// <summary>
-        /// Updates all attachments of the agent.
-        /// </summary>
-        /// <param name="agentID">agentID.</param>
-        /// <param name="data">data with all items on attachmentpoints</param>
-        public void UpdateUserAttachments(UUID agentID, Hashtable data)
-        {
-            string sql = "DELETE FROM avatarattachments WHERE UUID = @uuid";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", agentID));
-                command.ExecuteNonQuery();
-            }
-            if (data == null)
-                return;
-
-            sql = @"INSERT INTO avatarattachments (UUID, attachpoint, item, asset) 
-                    VALUES (@uuid, @attachpoint, @item, @asset)";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                bool firstTime = true;
-                foreach (DictionaryEntry e in data)
-                {
-                    int attachpoint = Convert.ToInt32(e.Key);
-
-                    Hashtable item = (Hashtable)e.Value;
-
-                    if (firstTime)
-                    {
-                        command.Parameters.Add(database.CreateParameter("@uuid", agentID));
-                        command.Parameters.Add(database.CreateParameter("@attachpoint", attachpoint));
-                        command.Parameters.Add(database.CreateParameter("@item", new UUID(item["item"].ToString())));
-                        command.Parameters.Add(database.CreateParameter("@asset", new UUID(item["asset"].ToString())));
-                        firstTime = false;
-                    }
-                    command.Parameters["@uuid"].Value = agentID.Guid; //.ToString();
-                    command.Parameters["@attachpoint"].Value = attachpoint;
-                    command.Parameters["@item"].Value = new Guid(item["item"].ToString());
-                    command.Parameters["@asset"].Value = new Guid(item["asset"].ToString());
-
-                    try
-                    {
-                        command.ExecuteNonQuery();
-                    }
-                    catch (Exception ex)
-                    {
-                        m_log.DebugFormat("[USER DB] : Error adding user attachment. {0}", ex.Message);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Resets all attachments of a agent in the database.
-        /// </summary>
-        /// <param name="agentID">agentID.</param>
-        override public void ResetAttachments(UUID agentID)
-        {
-            string sql = "UPDATE avatarattachments SET asset = '00000000-0000-0000-0000-000000000000' WHERE UUID = @uuid";
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("uuid", agentID));
-                command.ExecuteNonQuery();
-            }
-        }
-
-        override public void LogoutUsers(UUID regionID)
-        {
-        }
-
-        #endregion
-
-        #region Other public methods
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="queryID"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
-            string[] querysplit = query.Split(' ');
-            if (querysplit.Length == 2)
-            {
-                try
-                {
-                    string sql = string.Format(@"SELECT UUID,username,lastname FROM {0} 
-                                                 WHERE username LIKE @first AND lastname LIKE @second", m_usersTableName);
-                    using (AutoClosingSqlCommand command = database.Query(sql))
-                    {
-                        //Add wildcard to the search
-                        command.Parameters.Add(database.CreateParameter("first", querysplit[0] + "%"));
-                        command.Parameters.Add(database.CreateParameter("second", querysplit[1] + "%"));
-                        using (SqlDataReader reader = command.ExecuteReader())
-                        {
-                            while (reader.Read())
-                            {
-                                AvatarPickerAvatar user = new AvatarPickerAvatar();
-                                user.AvatarID = new UUID((Guid)reader["UUID"]);
-                                user.firstName = (string)reader["username"];
-                                user.lastName = (string)reader["lastname"];
-                                returnlist.Add(user);
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.ToString());
-                }
-            }
-            else if (querysplit.Length == 1)
-            {
-                try
-                {
-                    string sql = string.Format(@"SELECT UUID,username,lastname FROM {0} 
-                                                 WHERE username LIKE @first OR lastname LIKE @first", m_usersTableName);
-                    using (AutoClosingSqlCommand command = database.Query(sql))
-                    {
-                        command.Parameters.Add(database.CreateParameter("first", querysplit[0] + "%"));
-
-                        using (SqlDataReader reader = command.ExecuteReader())
-                        {
-                            while (reader.Read())
-                            {
-                                AvatarPickerAvatar user = new AvatarPickerAvatar();
-                                user.AvatarID = new UUID((Guid)reader["UUID"]);
-                                user.firstName = (string)reader["username"];
-                                user.lastName = (string)reader["lastname"];
-                                returnlist.Add(user);
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.ToString());
-                }
-            }
-            return returnlist;
-        }
-
-        /// <summary>
-        /// Store a weblogin key
-        /// </summary>
-        /// <param name="AgentID">The agent UUID</param>
-        /// <param name="WebLoginKey">the WebLogin Key</param>
-        /// <remarks>unused ?</remarks>
-        override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
-        {
-            UserProfileData user = GetUserByUUID(AgentID);
-            user.WebLoginKey = WebLoginKey;
-            UpdateUserProfile(user);
-        }
-
-        /// <summary>
-        /// Database provider name
-        /// </summary>
-        /// <returns>Provider name</returns>
-        override public string Name
-        {
-            get { return "MSSQL Userdata Interface"; }
-        }
-
-        /// <summary>
-        /// Database provider version
-        /// </summary>
-        /// <returns>provider version</returns>
-        override public string Version
-        {
-            get { return database.getVersion(); }
-        }
-
-        #endregion
-
-        #region Private functions
-
-        /// <summary>
-        /// Reads a one item from an SQL result
-        /// </summary>
-        /// <param name="reader">The SQL Result</param>
-        /// <returns>the item read</returns>
-        private static AvatarAppearance readUserAppearance(SqlDataReader reader)
-        {
-            try
-            {
-                AvatarAppearance appearance = new AvatarAppearance();
-
-                appearance.Owner = new UUID((Guid)reader["owner"]);
-                appearance.Serial = Convert.ToInt32(reader["serial"]);
-                appearance.VisualParams = (byte[])reader["visual_params"];
-                appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
-                appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
-                appearance.BodyItem = new UUID((Guid)reader["body_item"]);
-                appearance.BodyAsset = new UUID((Guid)reader["body_asset"]);
-                appearance.SkinItem = new UUID((Guid)reader["skin_item"]);
-                appearance.SkinAsset = new UUID((Guid)reader["skin_asset"]);
-                appearance.HairItem = new UUID((Guid)reader["hair_item"]);
-                appearance.HairAsset = new UUID((Guid)reader["hair_asset"]);
-                appearance.EyesItem = new UUID((Guid)reader["eyes_item"]);
-                appearance.EyesAsset = new UUID((Guid)reader["eyes_asset"]);
-                appearance.ShirtItem = new UUID((Guid)reader["shirt_item"]);
-                appearance.ShirtAsset = new UUID((Guid)reader["shirt_asset"]);
-                appearance.PantsItem = new UUID((Guid)reader["pants_item"]);
-                appearance.PantsAsset = new UUID((Guid)reader["pants_asset"]);
-                appearance.ShoesItem = new UUID((Guid)reader["shoes_item"]);
-                appearance.ShoesAsset = new UUID((Guid)reader["shoes_asset"]);
-                appearance.SocksItem = new UUID((Guid)reader["socks_item"]);
-                appearance.SocksAsset = new UUID((Guid)reader["socks_asset"]);
-                appearance.JacketItem = new UUID((Guid)reader["jacket_item"]);
-                appearance.JacketAsset = new UUID((Guid)reader["jacket_asset"]);
-                appearance.GlovesItem = new UUID((Guid)reader["gloves_item"]);
-                appearance.GlovesAsset = new UUID((Guid)reader["gloves_asset"]);
-                appearance.UnderShirtItem = new UUID((Guid)reader["undershirt_item"]);
-                appearance.UnderShirtAsset = new UUID((Guid)reader["undershirt_asset"]);
-                appearance.UnderPantsItem = new UUID((Guid)reader["underpants_item"]);
-                appearance.UnderPantsAsset = new UUID((Guid)reader["underpants_asset"]);
-                appearance.SkirtItem = new UUID((Guid)reader["skirt_item"]);
-                appearance.SkirtAsset = new UUID((Guid)reader["skirt_asset"]);
-
-                return appearance;
-            }
-            catch (SqlException e)
-            {
-                m_log.Error(e.ToString());
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Insert/Update a agent row in the DB.
-        /// </summary>
-        /// <param name="agentdata">agentdata.</param>
-        private void InsertUpdateAgentRow(UserAgentData agentdata)
-        {
-            string sql = @"
-
-IF EXISTS (SELECT * FROM agents WHERE UUID = @UUID)
-    BEGIN
-        UPDATE agents SET UUID = @UUID, sessionID = @sessionID, secureSessionID = @secureSessionID, agentIP = @agentIP, agentPort = @agentPort, agentOnline = @agentOnline, loginTime = @loginTime, logoutTime = @logoutTime, currentRegion = @currentRegion, currentHandle = @currentHandle, currentPos = @currentPos
-        WHERE UUID = @UUID
-    END
-ELSE
-    BEGIN
-        INSERT INTO 
-            agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos) VALUES 
-            (@UUID, @sessionID, @secureSessionID, @agentIP, @agentPort, @agentOnline, @loginTime, @logoutTime, @currentRegion, @currentHandle, @currentPos)
-    END
-";
-
-            using (AutoClosingSqlCommand command = database.Query(sql))
-            {
-                command.Parameters.Add(database.CreateParameter("@UUID", agentdata.ProfileID));
-                command.Parameters.Add(database.CreateParameter("@sessionID", agentdata.SessionID));
-                command.Parameters.Add(database.CreateParameter("@secureSessionID", agentdata.SecureSessionID));
-                command.Parameters.Add(database.CreateParameter("@agentIP", agentdata.AgentIP));
-                command.Parameters.Add(database.CreateParameter("@agentPort", agentdata.AgentPort));
-                command.Parameters.Add(database.CreateParameter("@agentOnline", agentdata.AgentOnline));
-                command.Parameters.Add(database.CreateParameter("@loginTime", agentdata.LoginTime));
-                command.Parameters.Add(database.CreateParameter("@logoutTime", agentdata.LogoutTime));
-                command.Parameters.Add(database.CreateParameter("@currentRegion", agentdata.Region));
-                command.Parameters.Add(database.CreateParameter("@currentHandle", agentdata.Handle));
-                command.Parameters.Add(database.CreateParameter("@currentPos", "<" + ((int)agentdata.Position.X) + "," + ((int)agentdata.Position.Y) + "," + ((int)agentdata.Position.Z) + ">"));
-
-                command.Transaction = command.Connection.BeginTransaction(IsolationLevel.Serializable);
-                try
-                {
-                    if (command.ExecuteNonQuery() > 0)
-                    {
-                        command.Transaction.Commit();
-                        return;
-                    }
-
-                    command.Transaction.Rollback();
-                    return;
-                }
-                catch (Exception e)
-                {
-                    command.Transaction.Rollback();
-                    m_log.Error(e.ToString());
-                    return;
-                }
-            }
-
-        }
-
-        /// <summary>
-        /// Reads an agent row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user session agent</returns>
-        private UserAgentData readAgentRow(SqlDataReader reader)
-        {
-            UserAgentData retval = new UserAgentData();
-
-            if (reader.Read())
-            {
-                // Agent IDs
-                retval.ProfileID = new UUID((Guid)reader["UUID"]);
-                retval.SessionID = new UUID((Guid)reader["sessionID"]);
-                retval.SecureSessionID = new UUID((Guid)reader["secureSessionID"]);
-
-                // Agent Who?
-                retval.AgentIP = (string)reader["agentIP"];
-                retval.AgentPort = Convert.ToUInt32(reader["agentPort"].ToString());
-                retval.AgentOnline = Convert.ToInt32(reader["agentOnline"].ToString()) != 0;
-
-                // Login/Logout times (UNIX Epoch)
-                retval.LoginTime = Convert.ToInt32(reader["loginTime"].ToString());
-                retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
-
-                // Current position
-                retval.Region = new UUID((Guid)reader["currentRegion"]);
-                retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                Vector3 tmp_v;
-                Vector3.TryParse((string)reader["currentPos"], out tmp_v);
-                retval.Position = tmp_v;
-
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Creates a new user and inserts it into the database
-        /// </summary>
-        /// <param name="uuid">User ID</param>
-        /// <param name="username">First part of the login</param>
-        /// <param name="lastname">Second part of the login</param>
-        /// <param name="email">Email of person</param>
-        /// <param name="passwordHash">A salted hash of the users password</param>
-        /// <param name="passwordSalt">The salt used for the password hash</param>
-        /// <param name="homeRegion">A regionHandle of the users home region</param>
-        /// <param name="homeLocX">Home region position vector</param>
-        /// <param name="homeLocY">Home region position vector</param>
-        /// <param name="homeLocZ">Home region position vector</param>
-        /// <param name="homeLookAtX">Home region 'look at' vector</param>
-        /// <param name="homeLookAtY">Home region 'look at' vector</param>
-        /// <param name="homeLookAtZ">Home region 'look at' vector</param>
-        /// <param name="created">Account created (unix timestamp)</param>
-        /// <param name="lastlogin">Last login (unix timestamp)</param>
-        /// <param name="inventoryURI">Users inventory URI</param>
-        /// <param name="assetURI">Users asset URI</param>
-        /// <param name="canDoMask">I can do mask</param>
-        /// <param name="wantDoMask">I want to do mask</param>
-        /// <param name="aboutText">Profile text</param>
-        /// <param name="firstText">Firstlife text</param>
-        /// <param name="profileImage">UUID for profile image</param>
-        /// <param name="firstImage">UUID for firstlife image</param>
-        /// <param name="webLoginKey">web login key</param>
-        /// <param name="homeRegionID">homeregion UUID</param>
-        /// <param name="godLevel">has the user godlevel</param>
-        /// <param name="userFlags">unknown</param>
-        /// <param name="customType">unknown</param>
-        /// <param name="partnerID">UUID of partner</param>
-        /// <returns>Success?</returns>
-        private void InsertUserRow(UUID uuid, string username, string lastname, string email, string passwordHash,
-                                   string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ,
-                                   float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
-                                   string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
-                                   string aboutText, string firstText,
-                                   UUID profileImage, UUID firstImage, UUID webLoginKey, UUID homeRegionID,
-                                   int godLevel, int userFlags, string customType, UUID partnerID)
-        {
-            string sql = string.Format(@"INSERT INTO {0} 
-                ([UUID], [username], [lastname], [email], [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]) 
-                VALUES 
-                (@UUID, @username, @lastname, @email, @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)", m_usersTableName);
-
-            try
-            {
-                using (AutoClosingSqlCommand command = database.Query(sql))
-                {
-                    command.Parameters.Add(database.CreateParameter("UUID", uuid));
-                    command.Parameters.Add(database.CreateParameter("username", username));
-                    command.Parameters.Add(database.CreateParameter("lastname", lastname));
-                    command.Parameters.Add(database.CreateParameter("email", email));
-                    command.Parameters.Add(database.CreateParameter("passwordHash", passwordHash));
-                    command.Parameters.Add(database.CreateParameter("passwordSalt", passwordSalt));
-                    command.Parameters.Add(database.CreateParameter("homeRegion", homeRegion));
-                    command.Parameters.Add(database.CreateParameter("homeLocationX", homeLocX));
-                    command.Parameters.Add(database.CreateParameter("homeLocationY", homeLocY));
-                    command.Parameters.Add(database.CreateParameter("homeLocationZ", homeLocZ));
-                    command.Parameters.Add(database.CreateParameter("homeLookAtX", homeLookAtX));
-                    command.Parameters.Add(database.CreateParameter("homeLookAtY", homeLookAtY));
-                    command.Parameters.Add(database.CreateParameter("homeLookAtZ", homeLookAtZ));
-                    command.Parameters.Add(database.CreateParameter("created", created));
-                    command.Parameters.Add(database.CreateParameter("lastLogin", lastlogin));
-                    command.Parameters.Add(database.CreateParameter("userInventoryURI", inventoryURI));
-                    command.Parameters.Add(database.CreateParameter("userAssetURI", assetURI));
-                    command.Parameters.Add(database.CreateParameter("profileCanDoMask", canDoMask));
-                    command.Parameters.Add(database.CreateParameter("profileWantDoMask", wantDoMask));
-                    command.Parameters.Add(database.CreateParameter("profileAboutText", aboutText));
-                    command.Parameters.Add(database.CreateParameter("profileFirstText", firstText));
-                    command.Parameters.Add(database.CreateParameter("profileImage", profileImage));
-                    command.Parameters.Add(database.CreateParameter("profileFirstImage", firstImage));
-                    command.Parameters.Add(database.CreateParameter("webLoginKey", webLoginKey));
-                    command.Parameters.Add(database.CreateParameter("homeRegionID", homeRegionID));
-                    command.Parameters.Add(database.CreateParameter("userFlags", userFlags));
-                    command.Parameters.Add(database.CreateParameter("godLevel", godLevel));
-                    command.Parameters.Add(database.CreateParameter("customType", customType));
-                    command.Parameters.Add(database.CreateParameter("partner", partnerID));
-                    
-                    command.ExecuteNonQuery();
-                    return;
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return;
-            }
-        }
-
-        /// <summary>
-        /// Reads a user profile from an active data reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user profile</returns>
-        private static UserProfileData ReadUserRow(SqlDataReader reader)
-        {
-            UserProfileData retval = new UserProfileData();
-
-            if (reader.Read())
-            {
-                retval.ID = new UUID((Guid)reader["UUID"]);
-                retval.FirstName = (string)reader["username"];
-                retval.SurName = (string)reader["lastname"];
-                if (reader.IsDBNull(reader.GetOrdinal("email")))
-                    retval.Email = "";
-                else
-                    retval.Email = (string)reader["email"];
-
-                retval.PasswordHash = (string)reader["passwordHash"];
-                retval.PasswordSalt = (string)reader["passwordSalt"];
-
-                retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.HomeLocation = new Vector3(
-                    Convert.ToSingle(reader["homeLocationX"].ToString()),
-                    Convert.ToSingle(reader["homeLocationY"].ToString()),
-                    Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.HomeLookAt = new Vector3(
-                    Convert.ToSingle(reader["homeLookAtX"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtY"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));
-
-                if (reader.IsDBNull(reader.GetOrdinal("homeRegionID")))
-                    retval.HomeRegionID = UUID.Zero;
-                else
-                    retval.HomeRegionID = new UUID((Guid)reader["homeRegionID"]);
-
-                retval.Created = Convert.ToInt32(reader["created"].ToString());
-                retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
-
-                if (reader.IsDBNull(reader.GetOrdinal("userInventoryURI")))
-                    retval.UserInventoryURI = "";
-                else
-                    retval.UserInventoryURI = (string)reader["userInventoryURI"];
-
-                if (reader.IsDBNull(reader.GetOrdinal("userAssetURI")))
-                    retval.UserAssetURI = "";
-                else
-                    retval.UserAssetURI = (string)reader["userAssetURI"];
-
-                retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
-                retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
-
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
-                    retval.AboutText = "";
-                else
-                    retval.AboutText = (string)reader["profileAboutText"];
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
-                    retval.FirstLifeAboutText = "";
-                else
-                    retval.FirstLifeAboutText = (string)reader["profileFirstText"];
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
-                    retval.Image = UUID.Zero;
-                else
-                    retval.Image = new UUID((Guid)reader["profileImage"]);
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
-                    retval.Image = UUID.Zero;
-                else
-                    retval.FirstLifeImage = new UUID((Guid)reader["profileFirstImage"]);
-
-                if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
-                    retval.WebLoginKey = UUID.Zero;
-                else
-                    retval.WebLoginKey = new UUID((Guid)reader["webLoginKey"]);
-
-                retval.UserFlags = Convert.ToInt32(reader["userFlags"].ToString());
-                retval.GodLevel = Convert.ToInt32(reader["godLevel"].ToString());
-                if (reader.IsDBNull(reader.GetOrdinal("customType")))
-                    retval.CustomType = "";
-                else
-                    retval.CustomType = reader["customType"].ToString();
-
-                if (reader.IsDBNull(reader.GetOrdinal("partner")))
-                    retval.Partner = UUID.Zero;
-                else
-                    retval.Partner = new UUID((Guid)reader["partner"]);
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-        #endregion
-    }
-
-}
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
new file mode 100644
index 0000000..739eb55
--- /dev/null
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ''AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using System.Data.SqlClient;
+using System.Reflection;
+using System.Text;
+using log4net;
+
+namespace OpenSim.Data.MSSQL
+{
+    public class MSSQLXInventoryData : IXInventoryData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private MSSQLGenericTableHandler<XInventoryFolder> m_Folders;
+        private MSSQLItemHandler m_Items;
+
+        public MSSQLXInventoryData(string conn, string realm)
+        {
+            m_Folders = new MSSQLGenericTableHandler<XInventoryFolder>(
+                    conn, "inventoryfolders", "InventoryStore");
+            m_Items = new MSSQLItemHandler(
+                    conn, "inventoryitems", String.Empty);
+        }
+
+        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
+        {
+            return m_Folders.Get(fields, vals);
+        }
+
+        public XInventoryItem[] GetItems(string[] fields, string[] vals)
+        {
+            return m_Items.Get(fields, vals);
+        }
+
+        public bool StoreFolder(XInventoryFolder folder)
+        {
+            return m_Folders.Store(folder);
+        }
+
+        public bool StoreItem(XInventoryItem item)
+        {
+            return m_Items.Store(item);
+        }
+
+        public bool DeleteFolders(string field, string val)
+        {
+            return m_Folders.Delete(field, val);
+        }
+
+        public bool DeleteItems(string field, string val)
+        {
+            return m_Items.Delete(field, val);
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            return m_Items.MoveItem(id, newParent);
+        }
+
+        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        {
+            return m_Items.GetActiveGestures(principalID);
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            return m_Items.GetAssetPermissions(principalID, assetID);
+        }
+    }
+
+    public class MSSQLItemHandler : MSSQLGenericTableHandler<XInventoryItem>
+    {
+        public MSSQLItemHandler(string c, string t, string m) :
+            base(c, t, m)
+        {
+        }
+
+        public bool MoveItem(string id, string newParent)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+
+                cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where inventoryID = @InventoryID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParent));
+                cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
+                cmd.Connection = conn;
+                conn.Open();
+                return cmd.ExecuteNonQuery() == 0 ? false : true;
+            }
+        }
+
+        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+                cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
+
+                cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
+                cmd.Connection = conn;
+                conn.Open();
+                return DoQuery(cmd);
+            }
+        }
+
+        public int GetAssetPermissions(UUID principalID, UUID assetID)
+        {
+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (SqlCommand cmd = new SqlCommand())
+            {
+                cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = @PrincipalID and assetID = @AssetID group by assetID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
+                cmd.Connection = conn;
+                conn.Open();
+                using (SqlDataReader reader = cmd.ExecuteReader())
+                {
+
+                    int perms = 0;
+
+                    if (reader.Read())
+                    {
+                        perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
+                    }
+
+                    return perms;
+                }
+
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MSSQL/Resources/001_AuthStore.sql b/OpenSim/Data/MSSQL/Resources/001_AuthStore.sql
new file mode 100644
index 0000000..c70a193
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/001_AuthStore.sql
@@ -0,0 +1,17 @@
+BEGIN TRANSACTION
+
+CREATE TABLE [auth] (
+  [uuid] [uniqueidentifier] NOT NULL default '00000000-0000-0000-0000-000000000000',
+  [passwordHash] [varchar](32) NOT NULL,
+  [passwordSalt] [varchar](32) NOT NULL,
+  [webLoginKey] [varchar](255) NOT NULL,
+  [accountType] VARCHAR(32) NOT NULL DEFAULT 'UserAccount',
+) ON [PRIMARY]
+
+CREATE TABLE [tokens] (
+  [uuid] [uniqueidentifier] NOT NULL default '00000000-0000-0000-0000-000000000000',
+  [token] [varchar](255) NOT NULL,
+  [validity] [datetime] NOT NULL )
+  ON [PRIMARY]
+
+COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_Avatar.sql b/OpenSim/Data/MSSQL/Resources/001_Avatar.sql
new file mode 100644
index 0000000..48f4c00
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/001_Avatar.sql
@@ -0,0 +1,15 @@
+BEGIN TRANSACTION
+
+CREATE TABLE [Avatars] (
+[PrincipalID] uniqueidentifier NOT NULL, 
+[Name] varchar(32) NOT NULL, 
+[Value] varchar(255) NOT NULL DEFAULT '',
+PRIMARY KEY CLUSTERED 
+(
+        [PrincipalID] ASC, [Name] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+
+
+COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_FriendsStore.sql b/OpenSim/Data/MSSQL/Resources/001_FriendsStore.sql
new file mode 100644
index 0000000..94d240b
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/001_FriendsStore.sql
@@ -0,0 +1,11 @@
+BEGIN TRANSACTION
+
+CREATE TABLE [Friends] (
+[PrincipalID] uniqueidentifier NOT NULL, 
+[Friend] varchar(255) NOT NULL, 
+[Flags] char(16) NOT NULL DEFAULT '0',
+[Offered] varchar(32) NOT NULL DEFAULT 0)
+ ON [PRIMARY]
+
+
+COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_Presence.sql b/OpenSim/Data/MSSQL/Resources/001_Presence.sql
new file mode 100644
index 0000000..877881c
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/001_Presence.sql
@@ -0,0 +1,19 @@
+BEGIN TRANSACTION
+
+CREATE TABLE [Presence] (
+[UserID] varchar(255) NOT NULL, 
+[RegionID] uniqueidentifier NOT NULL, 
+[SessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+[SecureSessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+[Online] char(5) NOT NULL DEFAULT 'false',
+[Login] char(16) NOT NULL DEFAULT '0',
+[Logout] char(16) NOT NULL DEFAULT '0',
+[Position] char(64) NOT NULL DEFAULT '<0,0,0>',
+[LookAt] char(64) NOT NULL DEFAULT '<0,0,0>',
+[HomeRegionID] uniqueidentifier NOT NULL,
+[HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+[HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+)
+ ON [PRIMARY]
+
+COMMIT
\ No newline at end of file
diff --git a/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql
new file mode 100644
index 0000000..3dbf8a4
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/001_UserAccount.sql
@@ -0,0 +1,14 @@
+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/002_AuthStore.sql b/OpenSim/Data/MSSQL/Resources/002_AuthStore.sql
new file mode 100644
index 0000000..daed955
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/002_AuthStore.sql
@@ -0,0 +1,6 @@
+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_FriendsStore.sql b/OpenSim/Data/MSSQL/Resources/002_FriendsStore.sql
new file mode 100644
index 0000000..e67d20e
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/002_FriendsStore.sql
@@ -0,0 +1,6 @@
+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_Presence.sql b/OpenSim/Data/MSSQL/Resources/002_Presence.sql
new file mode 100644
index 0000000..a67671d
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/002_Presence.sql
@@ -0,0 +1,6 @@
+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_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/002_UserAccount.sql
new file mode 100644
index 0000000..89d1f34
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/002_UserAccount.sql
@@ -0,0 +1,12 @@
+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/003_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/003_UserAccount.sql
new file mode 100644
index 0000000..da0395b
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/003_UserAccount.sql
@@ -0,0 +1,9 @@
+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/004_UserAccount.sql b/OpenSim/Data/MSSQL/Resources/004_UserAccount.sql
new file mode 100644
index 0000000..a9a9021
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/004_UserAccount.sql
@@ -0,0 +1,7 @@
+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/007_GridStore.sql b/OpenSim/Data/MSSQL/Resources/007_GridStore.sql
new file mode 100644
index 0000000..0b66d40
--- /dev/null
+++ b/OpenSim/Data/MSSQL/Resources/007_GridStore.sql
@@ -0,0 +1,9 @@
+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/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..4622e23 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Data
                 return;
 
             // to prevent people from killing long migrations.
-            m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision.", _type);
+            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!");
 
             DbCommand cmd = _conn.CreateCommand();
@@ -138,7 +138,15 @@ namespace OpenSim.Data
                 cmd.CommandText = kvp.Value;
                 // we need to up the command timeout to infinite as we might be doing long migrations.
                 cmd.CommandTimeout = 0;
-                cmd.ExecuteNonQuery();
+                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);
+                }
 
                 if (version == 0)
                 {
@@ -246,7 +254,8 @@ namespace OpenSim.Data
                 if (m.Success)
                 {
                     int version = int.Parse(m.Groups[1].ToString());
-                    if (version > after) {
+                    if (version > after)
+                    {
                         using (Stream resource = _assem.GetManifestResourceStream(s))
                         {
                             using (StreamReader resourceReader = new StreamReader(resource))
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 666c22f..d55369a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
                             {
                                 if (dbReader.Read())
                                 {
-                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"]);
+                                    asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], UUID.Zero.ToString());
                                     asset.Data = (byte[])dbReader["data"];
                                     asset.Description = (string)dbReader["description"];
 
diff --git a/OpenSim/Data/MySQL/MySQLAvatarData.cs b/OpenSim/Data/MySQL/MySQLAvatarData.cs
new file mode 100644
index 0000000..5611302
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLAvatarData.cs
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLAvatarData : MySQLGenericTableHandler<AvatarBaseData>,
+            IAvatarData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public MySQLAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+        {
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = ?PrincipalID and `Name` = ?Name", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?Name", name);
+
+            if (ExecuteNonQuery(cmd) > 0)
+                return true;
+
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2eae2d8..d0c02f0 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -121,111 +121,110 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public EstateSettings LoadEstateSettings(UUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
-            EstateSettings es = new EstateSettings();
-            es.OnSave += StoreEstateSettings;
-
             string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) +
                 " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = ?RegionID";
 
-            bool migration = true;
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = sql;
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+
+                return DoLoad(cmd, regionID, create);
+            }
+        }
+
+        private EstateSettings DoLoad(MySqlCommand cmd, UUID regionID, bool create)
+        {
+            EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
 
-                using (MySqlCommand cmd = dbcon.CreateCommand())
-                {
-                    cmd.CommandText = sql;
-                    cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+                cmd.Connection = dbcon;
 
-                    using (IDataReader r = cmd.ExecuteReader())
+                bool found = false;
+
+                using (IDataReader r = cmd.ExecuteReader())
+                {
+                    if (r.Read())
                     {
-                        if (r.Read())
-                        {
-                            migration = false;
+                        found = true;
 
-                            foreach (string name in FieldList)
+                        foreach (string name in FieldList)
+                        {
+                            if (m_FieldMap[name].GetValue(es) is bool)
                             {
-                                if (m_FieldMap[name].GetValue(es) is bool)
-                                {
-                                    int v = Convert.ToInt32(r[name]);
-                                    if (v != 0)
-                                        m_FieldMap[name].SetValue(es, true);
-                                    else
-                                        m_FieldMap[name].SetValue(es, false);
-                                }
-                                else if (m_FieldMap[name].GetValue(es) is UUID)
-                                {
-                                    UUID uuid = UUID.Zero;
-
-                                    UUID.TryParse(r[name].ToString(), out uuid);
-                                    m_FieldMap[name].SetValue(es, uuid);
-                                }
+                                int v = Convert.ToInt32(r[name]);
+                                if (v != 0)
+                                    m_FieldMap[name].SetValue(es, true);
                                 else
-                                {
-                                    m_FieldMap[name].SetValue(es, r[name]);
-                                }
+                                    m_FieldMap[name].SetValue(es, false);
+                            }
+                            else if (m_FieldMap[name].GetValue(es) is UUID)
+                            {
+                                UUID uuid = UUID.Zero;
+
+                                UUID.TryParse(r[name].ToString(), out uuid);
+                                m_FieldMap[name].SetValue(es, uuid);
+                            }
+                            else
+                            {
+                                m_FieldMap[name].SetValue(es, r[name]);
                             }
                         }
                     }
                 }
 
-                if (migration)
+                if (!found && create)
                 {
                     // Migration case
                     List<string> names = new List<string>(FieldList);
 
                     names.Remove("EstateID");
 
-                    sql = "insert into estate_settings (" + String.Join(",", names.ToArray()) + ") values ( ?" + String.Join(", ?", names.ToArray()) + ")";
+                    string sql = "insert into estate_settings (" + String.Join(",", names.ToArray()) + ") values ( ?" + String.Join(", ?", names.ToArray()) + ")";
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    using (MySqlCommand cmd2 = dbcon.CreateCommand())
                     {
-                        cmd.CommandText = sql;
-                        cmd.Parameters.Clear();
+                        cmd2.CommandText = sql;
+                        cmd2.Parameters.Clear();
 
                         foreach (string name in FieldList)
                         {
                             if (m_FieldMap[name].GetValue(es) is bool)
                             {
                                 if ((bool)m_FieldMap[name].GetValue(es))
-                                    cmd.Parameters.AddWithValue("?" + name, "1");
+                                    cmd2.Parameters.AddWithValue("?" + name, "1");
                                 else
-                                    cmd.Parameters.AddWithValue("?" + name, "0");
+                                    cmd2.Parameters.AddWithValue("?" + name, "0");
                             }
                             else
                             {
-                                cmd.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
+                                cmd2.Parameters.AddWithValue("?" + name, m_FieldMap[name].GetValue(es).ToString());
                             }
                         }
 
-                        cmd.ExecuteNonQuery();
+                        cmd2.ExecuteNonQuery();
 
-                        cmd.CommandText = "select LAST_INSERT_ID() as id";
-                        cmd.Parameters.Clear();
+                        cmd2.CommandText = "select LAST_INSERT_ID() as id";
+                        cmd2.Parameters.Clear();
 
-                        using (IDataReader r = cmd.ExecuteReader())
+                        using (IDataReader r = cmd2.ExecuteReader())
                         {
                             r.Read();
                             es.EstateID = Convert.ToUInt32(r["id"]);
                         }
 
-                        cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
-                        cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-                        cmd.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
+                        cmd2.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
+                        cmd2.Parameters.AddWithValue("?RegionID", regionID.ToString());
+                        cmd2.Parameters.AddWithValue("?EstateID", es.EstateID.ToString());
 
                         // This will throw on dupe key
-                        try { cmd.ExecuteNonQuery(); }
-                        catch (Exception) { }
-
-                        // Munge and transfer the ban list
-                        cmd.Parameters.Clear();
-                        cmd.CommandText = "insert into estateban select " + es.EstateID.ToString() + ", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = ?UUID";
-                        cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
-
-                        try { cmd.ExecuteNonQuery(); }
+                        try { cmd2.ExecuteNonQuery(); }
                         catch (Exception) { }
 
                         es.Save();
@@ -398,5 +397,89 @@ namespace OpenSim.Data.MySQL
 
             return uuids.ToArray();
         }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_settings where EstateID = ?EstateID";
+
+                cmd.CommandText = sql;
+                cmd.Parameters.AddWithValue("?EstateID", estateID);
+
+                return DoLoad(cmd, UUID.Zero, false);
+            }
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            List<int> result = new List<int>();
+
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+
+                using (MySqlCommand cmd = dbcon.CreateCommand())
+                {
+                    cmd.CommandText = "select estateID from estate_settings where EstateName = ?EstateName";
+                    cmd.Parameters.AddWithValue("?EstateName", search);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            result.Add(Convert.ToInt32(reader["EstateID"]));
+                        }
+                        reader.Close();
+                    }
+                }
+
+
+                dbcon.Close();
+            }
+
+            return result;
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+
+                try
+                {
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "insert into estate_map values (?RegionID, ?EstateID)";
+                        cmd.Parameters.AddWithValue("?RegionID", regionID);
+                        cmd.Parameters.AddWithValue("?EstateID", estateID);
+
+                        int ret = cmd.ExecuteNonQuery();
+                        dbcon.Close();
+
+                        return (ret != 0);
+                    }
+                }
+                catch (MySqlException ex)
+                {
+                    m_log.Error("[REGION DB]: LinkRegion failed: " + ex.Message);
+                }
+
+                dbcon.Close();
+            }
+
+            return false;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            return new List<UUID>();
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs
new file mode 100644
index 0000000..663fad6
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    public class MySqlFriendsData : MySQLGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public MySqlFriendsData(string connectionString, string realm)
+                : base(connectionString, realm, "FriendsStore")
+        {
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where PrincipalID = ?PrincipalID and Friend = ?Friend", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+            cmd.Parameters.AddWithValue("?Friend", friend);
+
+            ExecuteNonQuery(cmd);
+
+            return true;
+        }
+
+        public FriendsData[] GetFriends(UUID principalID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = ?PrincipalID", m_Realm);
+            cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+
+            return DoQuery(cmd);
+        }
+    }
+}
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 7d3593c..1253e0b 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -95,12 +95,12 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public T[] Get(string field, string key)
+        public virtual T[] Get(string field, string key)
         {
             return Get(new string[] { field }, new string[] { key });
         }
 
-        public T[] Get(string[] fields, string[] keys)
+        public virtual T[] Get(string[] fields, string[] keys)
         {
             if (fields.Length != keys.Length)
                 return new T[0];
@@ -194,11 +194,10 @@ namespace OpenSim.Data.MySQL
             return result.ToArray();
         }
 
-        public T[] Get(string where)
+        public virtual T[] Get(string where)
         {
             using (MySqlCommand cmd = new MySqlCommand())
             {
-            
                 string query = String.Format("select * from {0} where {1}",
                                              m_Realm, where);
                 
@@ -208,7 +207,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public bool Store(T row)
+        public virtual bool Store(T row)
         {
             using (MySqlCommand cmd = new MySqlCommand())
             {
@@ -248,7 +247,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public bool Delete(string field, string val)
+        public virtual bool Delete(string field, string val)
         {
             using (MySqlCommand cmd = new MySqlCommand())
             {
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
deleted file mode 100644
index f4e7b85..0000000
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using System.Threading;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MySQL
-{
-    /// <summary>
-    /// A MySQL Interface for the Grid Server
-    /// </summary>
-    public class MySQLGridData : GridDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MySQLManager m_database;
-        private object m_dbLock = new object();
-        private string m_connectionString;
-
-        override public void Initialise()
-        {
-            m_log.Info("[MySQLGridData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// <para>Initialises Grid interface</para>
-        /// <para>
-        /// <list type="bullet">
-        /// <item>Loads and initialises the MySQL storage plugin</item>
-        /// <item>Warns and uses the obsolete mysql_connection.ini if connect string is empty.</item>
-        /// <item>Check for migration</item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        /// <param name="connect">connect string.</param>
-        override public void Initialise(string connect)
-        {
-            m_connectionString = connect;
-            m_database = new MySQLManager(connect);
-
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                Migration m = new Migration(dbcon, assem, "GridStore");
-                m.Update();
-            }
-        }
-
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        override public void Dispose()
-        {
-        }
-
-        /// <summary>
-        /// Returns the plugin name
-        /// </summary>
-        /// <returns>Plugin name</returns>
-        override public string Name
-        {
-            get { return "MySql OpenGridData"; }
-        }
-
-        /// <summary>
-        /// Returns the plugin version
-        /// </summary>
-        /// <returns>Plugin version</returns>
-        override public string Version
-        {
-            get { return "0.1"; }
-        }
-
-        /// <summary>
-        /// Returns all the specified region profiles within coordates -- coordinates are inclusive
-        /// </summary>
-        /// <param name="xmin">Minimum X coordinate</param>
-        /// <param name="ymin">Minimum Y coordinate</param>
-        /// <param name="xmax">Maximum X coordinate</param>
-        /// <param name="ymax">Maximum Y coordinate</param>
-        /// <returns>Array of sim profiles</returns>
-        override public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                    param["?xmin"] = xmin.ToString();
-                    param["?ymin"] = ymin.ToString();
-                    param["?xmax"] = xmax.ToString();
-                    param["?ymax"] = ymax.ToString();
-
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                    {
-                        dbcon.Open();
-
-                        using (IDbCommand result = m_database.Query(dbcon,
-                                "SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax",
-                                param))
-                        {
-                            using (IDataReader reader = result.ExecuteReader())
-                            {
-                                RegionProfileData row;
-
-                                List<RegionProfileData> rows = new List<RegionProfileData>();
-
-                                while ((row = m_database.readSimRow(reader)) != null)
-                                    rows.Add(row);
-
-                                return rows.ToArray();
-                            }
-                        }
-                    }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns up to maxNum profiles of regions that have a name starting with namePrefix
-        /// </summary>
-        /// <param name="name">The name to match against</param>
-        /// <param name="maxNum">Maximum number of profiles to return</param>
-        /// <returns>A list of sim profiles</returns>
-        override public List<RegionProfileData> GetRegionsByName(string namePrefix, uint maxNum)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?name"] = namePrefix + "%";
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon,
-                        "SELECT * FROM regions WHERE regionName LIKE ?name",
-                        param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            RegionProfileData row;
-
-                            List<RegionProfileData> rows = new List<RegionProfileData>();
-
-                            while (rows.Count < maxNum && (row = m_database.readSimRow(reader)) != null)
-                                rows.Add(row);
-
-                            return rows;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's location
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        override public RegionProfileData GetProfileByHandle(ulong handle)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?handle"] = handle.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon, "SELECT * FROM regions WHERE regionHandle = ?handle", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            RegionProfileData row = m_database.readSimRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByUUID(UUID uuid)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?uuid"] = uuid.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon, "SELECT * FROM regions WHERE uuid = ?uuid", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            RegionProfileData row = m_database.readSimRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's Region name string
-        /// </summary>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByString(string regionName)
-        {
-            if (regionName.Length > 2)
-            {
-                try
-                {
-                    Dictionary<string, object> param = new Dictionary<string, object>();
-                    // Add % because this is a like query.
-                    param["?regionName"] = regionName + "%";
-
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                    {
-                        dbcon.Open();
-
-                        // Order by statement will return shorter matches first.  Only returns one record or no record.
-                        using (IDbCommand result = m_database.Query(dbcon,
-                            "SELECT * FROM regions WHERE regionName like ?regionName order by LENGTH(regionName) asc LIMIT 1",
-                            param))
-                        {
-                            using (IDataReader reader = result.ExecuteReader())
-                            {
-                                RegionProfileData row = m_database.readSimRow(reader);
-                                return row;
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.Message, e);
-                    return null;
-                }
-            }
-
-            m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters");
-            return null;
-        }
-
-        /// <summary>
-        /// Adds a new profile to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>Successful?</returns>
-        override public DataResponse StoreProfile(RegionProfileData profile)
-        {
-            try
-            {
-                if (m_database.insertRegion(profile))
-                    return DataResponse.RESPONSE_OK;
-                else
-                    return DataResponse.RESPONSE_ERROR;
-            }
-            catch
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-
-        /// <summary>
-        /// Deletes a sim profile from the database
-        /// </summary>
-        /// <param name="uuid">the sim UUID</param>
-        /// <returns>Successful?</returns>
-        //public DataResponse DeleteProfile(RegionProfileData profile)
-        override public DataResponse DeleteProfile(string uuid)
-        {
-            try
-            {
-                if (m_database.deleteRegion(uuid))
-                    return DataResponse.RESPONSE_OK;
-                else
-                    return DataResponse.RESPONSE_ERROR;
-            }
-            catch
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-
-        /// <summary>
-        /// DEPRECATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-
-            RegionProfileData data = GetProfileByUUID(uuid);
-
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
-        {
-            // SHA512Managed HashProvider = new SHA512Managed();
-            // Encoding TextProvider = new UTF8Encoding();
-
-            // byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
-            // byte[] hash = HashProvider.ComputeHash(stream);
-
-            return false;
-        }
-
-        /// <summary>
-        /// Adds a location reservation
-        /// </summary>
-        /// <param name="x">x coordinate</param>
-        /// <param name="y">y coordinate</param>
-        /// <returns></returns>
-        override public ReservationData GetReservationAtPoint(uint x, uint y)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?x"] = x.ToString();
-                param["?y"] = y.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon,
-                        "SELECT * FROM reservations WHERE resXMin <= ?x AND resXMax >= ?x AND resYMin <= ?y AND resYMax >= ?y",
-                        param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            ReservationData row = m_database.readReservationRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
new file mode 100644
index 0000000..df29ecd
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for user grid data
+    /// </summary>
+    public class MySQLGridUserData : MySQLGenericTableHandler<GridUserData>, IGridUserData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {}
+
+        public GridUserData GetGridUserData(string userID)
+        {
+            GridUserData[] ret = Get("UserID", userID);
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public bool StoreGridUserData(GridUserData data)
+        {
+            return Store(data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index f84beb6..a395ddc 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -711,9 +711,9 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
-            RegionMeta7WindlightData nWP = new RegionMeta7WindlightData();
+            RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
@@ -845,7 +845,7 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
deleted file mode 100644
index 304883c..0000000
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MySQL
-{
-    /// <summary>
-    /// An interface to the log database for MySQL
-    /// </summary>
-    internal class MySQLLogData : ILogDataPlugin
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        public MySQLManager database;
-
-        public void Initialise()
-        {
-            m_log.Info("[MySQLLogData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// Artificial constructor called when the plugin is loaded
-        /// Uses the obsolete mysql_connection.ini if connect string is empty.
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        public void Initialise(string connect)
-        {
-            if (connect != String.Empty)
-            {
-                database = new MySQLManager(connect);
-            }
-            else
-            {
-                m_log.Warn("Using deprecated mysql_connection.ini.  Please update database_connect in GridServer_Config.xml and we'll use that instead");
-
-                IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-                string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-                string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-                string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-                string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-                string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-                string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-
-                database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword,
-                                            settingPooling, settingPort);
-            }
-
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
-
-            using (MySql.Data.MySqlClient.MySqlConnection dbcon = new MySql.Data.MySqlClient.MySqlConnection(connect))
-            {
-                dbcon.Open();
-
-                Migration m = new Migration(dbcon, assem, "LogStore");
-
-                // TODO: After rev 6000, remove this.  People should have
-                // been rolled onto the new migration code by then.
-                TestTables(m);
-
-                m.Update();
-            }
-        }
-
-        /// <summary></summary>
-        /// <param name="m"></param>
-        private void TestTables(Migration m)
-        {
-            // under migrations, bail
-            if (m.Version > 0)
-                return;
-
-            Dictionary<string, string> tableList = new Dictionary<string, string>();
-            tableList["logs"] = null;
-            database.GetTableVersion(tableList);
-
-            // migrations will handle it
-            if (tableList["logs"] == null)
-                return;
-
-            // we have the table, so pretend like we did the first migration in the past
-            if (m.Version == 0)
-                m.Version = 1;
-        }
-
-        /// <summary>
-        /// Saves a log item to the database
-        /// </summary>
-        /// <param name="serverDaemon">The daemon triggering the event</param>
-        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">The message to log</param>
-        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,
-                            string logMessage)
-        {
-            try
-            {
-                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
-            }
-            catch
-            {
-            }
-        }
-
-        /// <summary>
-        /// Returns the name of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider name</returns>
-        public string Name
-        {
-            get { return "MySQL Logdata Interface";}
-        }
-
-        /// <summary>
-        /// Closes the database provider
-        /// </summary>
-        /// <remarks>do nothing</remarks>
-        public void Dispose()
-        {
-            // Do nothing.
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the provider version</returns>
-        public string Version
-        {
-            get { return "0.1"; }
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
deleted file mode 100644
index ace2027..0000000
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
-using System.Reflection;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MySQL
-{
-    /// <summary>
-    /// A MySQL Database manager
-    /// </summary>
-    public class MySQLManager
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// Connection string for ADO.net
-        /// </summary>
-        private string connectionString;
-
-        private object m_dbLock = new object();
-
-        private const string m_waitTimeoutSelect = "select @@wait_timeout";
-
-        /// <summary>
-        /// Wait timeout for our connection in ticks.
-        /// </summary>
-        private long m_waitTimeout;
-
-        /// <summary>
-        /// Make our storage of the timeout this amount smaller than it actually is, to give us a margin on long
-        /// running database operations.
-        /// </summary>
-        private long m_waitTimeoutLeeway = 60 * TimeSpan.TicksPerSecond;
-
-        /// <summary>
-        /// Holds the last tick time that the connection was used.
-        /// </summary>
-        private long m_lastConnectionUse;
-
-        /// <summary>
-        /// Initialises and creates a new MySQL connection and maintains it.
-        /// </summary>
-        /// <param name="hostname">The MySQL server being connected to</param>
-        /// <param name="database">The name of the MySQL database being used</param>
-        /// <param name="username">The username logging into the database</param>
-        /// <param name="password">The password for the user logging in</param>
-        /// <param name="cpooling">Whether to use connection pooling or not, can be one of the following: 'yes', 'true', 'no' or 'false', if unsure use 'false'.</param>
-        /// <param name="port">The MySQL server port</param>
-        public MySQLManager(string hostname, string database, string username, string password, string cpooling,
-                            string port)
-        {
-            string s = "Server=" + hostname + ";Port=" + port + ";Database=" + database + ";User ID=" +
-                username + ";Password=" + password + ";Pooling=" + cpooling + ";";
-
-            Initialise(s);
-        }
-
-        /// <summary>
-        /// Initialises and creates a new MySQL connection and maintains it.
-        /// </summary>
-        /// <param name="connect">connectionString</param>
-        public MySQLManager(String connect)
-        {
-            Initialise(connect);
-        }
-
-        /// <summary>
-        /// Initialises and creates a new MySQL connection and maintains it.
-        /// </summary>
-        /// <param name="connect">connectionString</param>
-        public void Initialise(String connect)
-        {
-            try
-            {
-                connectionString = connect;
-                //dbcon = new MySqlConnection(connectionString);
-
-                try
-                {
-                    //dbcon.Open();
-                }
-                catch(Exception e)
-                {
-                    throw new Exception("Connection error while using connection string ["+connectionString+"]", e);
-                }
-
-                m_log.Info("[MYSQL]: Connection established");
-                GetWaitTimeout();
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising MySql Database: " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Get the wait_timeout value for our connection
-        /// </summary>
-        protected void GetWaitTimeout()
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-            {
-                dbcon.Open();
-
-                using (MySqlCommand cmd = new MySqlCommand(m_waitTimeoutSelect, dbcon))
-                {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if (dbReader.Read())
-                        {
-                            m_waitTimeout
-                                = Convert.ToInt32(dbReader["@@wait_timeout"]) * TimeSpan.TicksPerSecond + m_waitTimeoutLeeway;
-                        }
-                    }
-                }
-            }
-
-            m_lastConnectionUse = DateTime.Now.Ticks;
-
-            m_log.DebugFormat(
-                "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
-        }
-
-        public string ConnectionString
-        {
-            get { return connectionString; }
-        }
-
-        /// <summary>
-        /// Returns the version of this DB provider
-        /// </summary>
-        /// <returns>A string containing the DB provider</returns>
-        public string getVersion()
-        {
-            Module module = GetType().Module;
-            // string dllName = module.Assembly.ManifestModule.Name;
-            Version dllVersion = module.Assembly.GetName().Version;
-
-            return
-                string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build,
-                        dllVersion.Revision);
-        }
-
-        /// <summary>
-        /// Extract a named string resource from the embedded resources
-        /// </summary>
-        /// <param name="name">name of embedded resource</param>
-        /// <returns>string contained within the embedded resource</returns>
-        private string getResourceString(string name)
-        {
-            Assembly assem = GetType().Assembly;
-            string[] names = assem.GetManifestResourceNames();
-
-            foreach (string s in names)
-            {
-                if (s.EndsWith(name))
-                {
-                    using (Stream resource = assem.GetManifestResourceStream(s))
-                    {
-                        using (StreamReader resourceReader = new StreamReader(resource))
-                        {
-                            string resourceString = resourceReader.ReadToEnd();
-                            return resourceString;
-                        }
-                    }
-                }
-            }
-            throw new Exception(string.Format("Resource '{0}' was not found", name));
-        }
-
-        /// <summary>
-        /// Execute a SQL statement stored in a resource, as a string
-        /// </summary>
-        /// <param name="name">name of embedded resource</param>
-        public void ExecuteResourceSql(string name)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-            {
-                dbcon.Open();
-
-                MySqlCommand cmd = new MySqlCommand(getResourceString(name), dbcon);
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Execute a MySqlCommand
-        /// </summary>
-        /// <param name="sql">sql string to execute</param>
-        public void ExecuteSql(string sql)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-            {
-                dbcon.Open();
-
-                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        public void ExecuteParameterizedSql(string sql, Dictionary<string, string> parameters)
-        {
-            using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-            {
-                dbcon.Open();
-
-                MySqlCommand cmd = (MySqlCommand)dbcon.CreateCommand();
-                cmd.CommandText = sql;
-                foreach (KeyValuePair<string, string> param in parameters)
-                {
-                    cmd.Parameters.AddWithValue(param.Key, param.Value);
-                }
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Given a list of tables, return the version of the tables, as seen in the database
-        /// </summary>
-        /// <param name="tableList"></param>
-        public void GetTableVersion(Dictionary<string, string> tableList)
-        {
-            lock (m_dbLock)
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand tablesCmd = new MySqlCommand(
-                        "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=?dbname", dbcon))
-                    {
-                        tablesCmd.Parameters.AddWithValue("?dbname", dbcon.Database);
-
-                        using (MySqlDataReader tables = tablesCmd.ExecuteReader())
-                        {
-                            while (tables.Read())
-                            {
-                                try
-                                {
-                                    string tableName = (string)tables["TABLE_NAME"];
-                                    string comment = (string)tables["TABLE_COMMENT"];
-                                    if (tableList.ContainsKey(tableName))
-                                    {
-                                        tableList[tableName] = comment;
-                                    }
-                                }
-                                catch (Exception e)
-                                {
-                                    m_log.Error(e.Message, e);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // TODO: at some time this code should be cleaned up
-
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="dbcon">Database connection</param>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A MySQL DB Command</returns>
-        public IDbCommand Query(MySqlConnection dbcon, string sql, Dictionary<string, object> parameters)
-        {
-            try
-            {
-                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
-                dbcommand.CommandText = sql;
-                foreach (KeyValuePair<string, object> param in parameters)
-                {
-                    dbcommand.Parameters.AddWithValue(param.Key, param.Value);
-                }
-
-                return (IDbCommand)dbcommand;
-            }
-            catch (Exception e)
-            {
-                // Return null if it fails.
-                m_log.Error("Failed during Query generation: " + e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Reads a region row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region profile</returns>
-        public RegionProfileData readSimRow(IDataReader reader)
-        {
-            RegionProfileData retval = new RegionProfileData();
-
-            if (reader.Read())
-            {
-                // Region Main gotta-have-or-we-return-null parts
-                UInt64 tmp64;
-                if (!UInt64.TryParse(reader["regionHandle"].ToString(), out tmp64))
-                {
-                    return null;
-                }
-                else
-                {
-                    retval.regionHandle = tmp64;
-                }
-                UUID tmp_uuid;
-                if (!UUID.TryParse((string)reader["uuid"], out tmp_uuid))
-                {
-                    return null;
-                }
-                else
-                {
-                    retval.UUID = tmp_uuid;
-                }
-
-                // non-critical parts
-                retval.regionName = (string)reader["regionName"];
-                retval.originUUID = new UUID((string) reader["originUUID"]);
-
-                // Secrets
-                retval.regionRecvKey = (string) reader["regionRecvKey"];
-                retval.regionSecret = (string) reader["regionSecret"];
-                retval.regionSendKey = (string) reader["regionSendKey"];
-
-                // Region Server
-                retval.regionDataURI = (string) reader["regionDataURI"];
-                retval.regionOnline = false; // Needs to be pinged before this can be set.
-                retval.serverIP = (string) reader["serverIP"];
-                retval.serverPort = (uint) reader["serverPort"];
-                retval.serverURI = (string) reader["serverURI"];
-                retval.httpPort = Convert.ToUInt32(reader["serverHttpPort"].ToString());
-                retval.remotingPort = Convert.ToUInt32(reader["serverRemotingPort"].ToString());
-
-                // Location
-                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());
-                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());
-                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());
-
-                // Neighbours - 0 = No Override
-                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());
-                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());
-                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());
-                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());
-
-                // Assets
-                retval.regionAssetURI = (string) reader["regionAssetURI"];
-                retval.regionAssetRecvKey = (string) reader["regionAssetRecvKey"];
-                retval.regionAssetSendKey = (string) reader["regionAssetSendKey"];
-
-                // Userserver
-                retval.regionUserURI = (string) reader["regionUserURI"];
-                retval.regionUserRecvKey = (string) reader["regionUserRecvKey"];
-                retval.regionUserSendKey = (string) reader["regionUserSendKey"];
-
-                // World Map Addition
-                UUID.TryParse((string)reader["regionMapTexture"], out retval.regionMapTextureID);
-                UUID.TryParse((string)reader["owner_uuid"], out retval.owner_uuid);
-                retval.maturity = Convert.ToUInt32(reader["access"]);
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Reads a reservation row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A reservation data object</returns>
-        public ReservationData readReservationRow(IDataReader reader)
-        {
-            ReservationData retval = new ReservationData();
-            if (reader.Read())
-            {
-                retval.gridRecvKey = (string) reader["gridRecvKey"];
-                retval.gridSendKey = (string) reader["gridSendKey"];
-                retval.reservationCompany = (string) reader["resCompany"];
-                retval.reservationMaxX = Convert.ToInt32(reader["resXMax"].ToString());
-                retval.reservationMaxY = Convert.ToInt32(reader["resYMax"].ToString());
-                retval.reservationMinX = Convert.ToInt32(reader["resXMin"].ToString());
-                retval.reservationMinY = Convert.ToInt32(reader["resYMin"].ToString());
-                retval.reservationName = (string) reader["resName"];
-                retval.status = Convert.ToInt32(reader["status"].ToString()) == 1;
-                UUID tmp;
-                UUID.TryParse((string) reader["userUUID"], out tmp);
-                retval.userUUID = tmp;
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Reads an agent row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user session agent</returns>
-        public UserAgentData readAgentRow(IDataReader reader)
-        {
-            UserAgentData retval = new UserAgentData();
-
-            if (reader.Read())
-            {
-                // Agent IDs
-                UUID tmp;
-                if (!UUID.TryParse((string)reader["UUID"], out tmp))
-                    return null;
-                retval.ProfileID = tmp;
-
-                UUID.TryParse((string) reader["sessionID"], out tmp);
-                retval.SessionID = tmp;
-
-                UUID.TryParse((string)reader["secureSessionID"], out tmp);
-                retval.SecureSessionID = tmp;
-
-                // Agent Who?
-                retval.AgentIP = (string) reader["agentIP"];
-                retval.AgentPort = Convert.ToUInt32(reader["agentPort"].ToString());
-                retval.AgentOnline = Convert.ToBoolean(Convert.ToInt16(reader["agentOnline"].ToString()));
-
-                // Login/Logout times (UNIX Epoch)
-                retval.LoginTime = Convert.ToInt32(reader["loginTime"].ToString());
-                retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
-
-                // Current position
-                retval.Region = new UUID((string)reader["currentRegion"]);
-                retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
-                Vector3 tmp_v;
-                Vector3.TryParse((string) reader["currentPos"], out tmp_v);
-                retval.Position = tmp_v;
-                Vector3.TryParse((string)reader["currentLookAt"], out tmp_v);
-                retval.LookAt = tmp_v;
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Reads a user profile from an active data reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A user profile</returns>
-        public UserProfileData readUserRow(IDataReader reader)
-        {
-            UserProfileData retval = new UserProfileData();
-
-            if (reader.Read())
-            {
-                UUID id;
-                if (!UUID.TryParse((string)reader["UUID"], out id))
-                    return null;
-
-                retval.ID = id;
-                retval.FirstName = (string) reader["username"];
-                retval.SurName = (string) reader["lastname"];
-                retval.Email = (reader.IsDBNull(reader.GetOrdinal("email"))) ? "" : (string) reader["email"];
-
-                retval.PasswordHash = (string) reader["passwordHash"];
-                retval.PasswordSalt = (string) reader["passwordSalt"];
-
-                retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.HomeLocation = new Vector3(
-                    Convert.ToSingle(reader["homeLocationX"].ToString()),
-                    Convert.ToSingle(reader["homeLocationY"].ToString()),
-                    Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.HomeLookAt = new Vector3(
-                    Convert.ToSingle(reader["homeLookAtX"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtY"].ToString()),
-                    Convert.ToSingle(reader["homeLookAtZ"].ToString()));
-
-                UUID regionID = UUID.Zero;
-                UUID.TryParse(reader["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
-                retval.HomeRegionID = regionID;
-
-                retval.Created = Convert.ToInt32(reader["created"].ToString());
-                retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
-                
-                retval.UserInventoryURI = (string) reader["userInventoryURI"];
-                retval.UserAssetURI = (string) reader["userAssetURI"];
-
-                retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
-                retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
-                    retval.AboutText = "";
-                else
-                    retval.AboutText = (string) reader["profileAboutText"];
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
-                    retval.FirstLifeAboutText = "";
-                else
-                    retval.FirstLifeAboutText = (string)reader["profileFirstText"];
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
-                    retval.Image = UUID.Zero;
-                else {
-                    UUID tmp;
-                    UUID.TryParse((string)reader["profileImage"], out tmp);
-                    retval.Image = tmp;
-                }
-
-                if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
-                    retval.FirstLifeImage = UUID.Zero;
-                else {
-                    UUID tmp;
-                    UUID.TryParse((string)reader["profileFirstImage"], out tmp);
-                    retval.FirstLifeImage = tmp;
-                }
-
-                if (reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
-                {
-                    retval.WebLoginKey = UUID.Zero;
-                }
-                else
-                {
-                    UUID tmp;
-                    UUID.TryParse((string)reader["webLoginKey"], out tmp);
-                    retval.WebLoginKey = tmp;
-                }
-
-                retval.UserFlags = Convert.ToInt32(reader["userFlags"].ToString());
-                retval.GodLevel = Convert.ToInt32(reader["godLevel"].ToString());
-                if (reader.IsDBNull(reader.GetOrdinal("customType")))
-                    retval.CustomType = "";
-                else
-                    retval.CustomType = reader["customType"].ToString();
-
-                if (reader.IsDBNull(reader.GetOrdinal("partner")))
-                {
-                    retval.Partner = UUID.Zero;
-                }
-                else
-                {
-                    UUID tmp;
-                    UUID.TryParse((string)reader["partner"], out tmp);
-                    retval.Partner = tmp;
-                }
-            }
-            else
-            {
-                return null;
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Reads an avatar appearence from an active data reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>An avatar appearence</returns>
-        public AvatarAppearance readAppearanceRow(IDataReader reader)
-        {
-            AvatarAppearance appearance = null;
-            if (reader.Read())
-            {
-                appearance = new AvatarAppearance();
-                appearance.Owner = new UUID((string)reader["owner"]);
-                appearance.Serial = Convert.ToInt32(reader["serial"]);
-                appearance.VisualParams = (byte[])reader["visual_params"];
-                appearance.Texture = new Primitive.TextureEntry((byte[])reader["texture"], 0, ((byte[])reader["texture"]).Length);
-                appearance.AvatarHeight = (float)Convert.ToDouble(reader["avatar_height"]);
-                appearance.BodyItem = new UUID((string)reader["body_item"]);
-                appearance.BodyAsset = new UUID((string)reader["body_asset"]);
-                appearance.SkinItem = new UUID((string)reader["skin_item"]);
-                appearance.SkinAsset = new UUID((string)reader["skin_asset"]);
-                appearance.HairItem = new UUID((string)reader["hair_item"]);
-                appearance.HairAsset = new UUID((string)reader["hair_asset"]);
-                appearance.EyesItem = new UUID((string)reader["eyes_item"]);
-                appearance.EyesAsset = new UUID((string)reader["eyes_asset"]);
-                appearance.ShirtItem = new UUID((string)reader["shirt_item"]);
-                appearance.ShirtAsset = new UUID((string)reader["shirt_asset"]);
-                appearance.PantsItem = new UUID((string)reader["pants_item"]);
-                appearance.PantsAsset = new UUID((string)reader["pants_asset"]);
-                appearance.ShoesItem = new UUID((string)reader["shoes_item"]);
-                appearance.ShoesAsset = new UUID((string)reader["shoes_asset"]);
-                appearance.SocksItem = new UUID((string)reader["socks_item"]);
-                appearance.SocksAsset = new UUID((string)reader["socks_asset"]);
-                appearance.JacketItem = new UUID((string)reader["jacket_item"]);
-                appearance.JacketAsset = new UUID((string)reader["jacket_asset"]);
-                appearance.GlovesItem = new UUID((string)reader["gloves_item"]);
-                appearance.GlovesAsset = new UUID((string)reader["gloves_asset"]);
-                appearance.UnderShirtItem = new UUID((string)reader["undershirt_item"]);
-                appearance.UnderShirtAsset = new UUID((string)reader["undershirt_asset"]);
-                appearance.UnderPantsItem = new UUID((string)reader["underpants_item"]);
-                appearance.UnderPantsAsset = new UUID((string)reader["underpants_asset"]);
-                appearance.SkirtItem = new UUID((string)reader["skirt_item"]);
-                appearance.SkirtAsset = new UUID((string)reader["skirt_asset"]);
-            }
-            return appearance;
-        }
-
-        // Read attachment list from data reader
-        public Hashtable readAttachments(IDataReader r)
-        {
-            Hashtable ret = new Hashtable();
-
-            while (r.Read())
-            {
-                int attachpoint = Convert.ToInt32(r["attachpoint"]);
-                if (ret.ContainsKey(attachpoint))
-                    continue;
-                Hashtable item = new Hashtable();
-                item.Add("item", r["item"].ToString());
-                item.Add("asset", r["asset"].ToString());
-
-                ret.Add(attachpoint, item);
-            }
-
-            return ret;
-        }
-
-        /// <summary>
-        /// Inserts a new row into the log database
-        /// </summary>
-        /// <param name="serverDaemon">The daemon which triggered this event</param>
-        /// <param name="target">Who were we operating on when this occured (region UUID, user UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">Extra message info</param>
-        /// <returns>Saved successfully?</returns>
-        public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority,
-                                 string logMessage)
-        {
-            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";
-            sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";
-
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters["?server"] = serverDaemon;
-            parameters["?target"] = target;
-            parameters["?method"] = methodCall;
-            parameters["?arguments"] = arguments;
-            parameters["?priority"] = priority.ToString();
-            parameters["?message"] = logMessage;
-
-            bool returnval = false;
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    if (result.ExecuteNonQuery() == 1)
-                        returnval = true;
-
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            return returnval;
-        }
-
-        /// <summary>
-        /// Creates a new user and inserts it into the database
-        /// </summary>
-        /// <param name="uuid">User ID</param>
-        /// <param name="username">First part of the login</param>
-        /// <param name="lastname">Second part of the login</param>
-        /// <param name="passwordHash">A salted hash of the users password</param>
-        /// <param name="passwordSalt">The salt used for the password hash</param>
-        /// <param name="homeRegion">A regionHandle of the users home region</param>
-        /// <param name="homeRegionID"> The UUID of the user's home region</param>
-        /// <param name="homeLocX">Home region position vector</param>
-        /// <param name="homeLocY">Home region position vector</param>
-        /// <param name="homeLocZ">Home region position vector</param>
-        /// <param name="homeLookAtX">Home region 'look at' vector</param>
-        /// <param name="homeLookAtY">Home region 'look at' vector</param>
-        /// <param name="homeLookAtZ">Home region 'look at' vector</param>
-        /// <param name="created">Account created (unix timestamp)</param>
-        /// <param name="lastlogin">Last login (unix timestamp)</param>
-        /// <param name="inventoryURI">Users inventory URI</param>
-        /// <param name="assetURI">Users asset URI</param>
-        /// <param name="canDoMask">I can do mask</param>
-        /// <param name="wantDoMask">I want to do mask</param>
-        /// <param name="aboutText">Profile text</param>
-        /// <param name="firstText">Firstlife text</param>
-        /// <param name="profileImage">UUID for profile image</param>
-        /// <param name="firstImage">UUID for firstlife image</param>
-        /// <param name="webLoginKey">Ignored</param>
-        /// <returns>Success?</returns>
-        public bool insertUserRow(UUID uuid, string username, string lastname, string email, string passwordHash,
-                                  string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
-                                  float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
-                                  string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
-                                  string aboutText, string firstText,
-                                  UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
-        {
-            m_log.Debug("[MySQLManager]: Creating profile for \"" + username + " " + lastname + "\" (" + uuid + ")");
-            string sql =
-                "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, `homeRegionID`, ";
-            sql +=
-                "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, ";
-            sql +=
-                "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, ";
-            sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`, `userFlags`, `godLevel`, `customType`, `partner`) VALUES ";
-
-            sql += "(?UUID, ?username, ?lastname, ?email, ?passwordHash, ?passwordSalt, ?homeRegion, ?homeRegionID, ";
-            sql +=
-                "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, ";
-            sql +=
-                "?lastLogin, ?userInventoryURI, ?userAssetURI, ?profileCanDoMask, ?profileWantDoMask, ?profileAboutText, ";
-            sql += "?profileFirstText, ?profileImage, ?profileFirstImage, ?webLoginKey, ?userFlags, ?godLevel, ?customType, ?partner)";
-
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters["?UUID"] = uuid.ToString();
-            parameters["?username"] = username;
-            parameters["?lastname"] = lastname;
-            parameters["?email"] = email;
-            parameters["?passwordHash"] = passwordHash;
-            parameters["?passwordSalt"] = passwordSalt;
-            parameters["?homeRegion"] = homeRegion;
-            parameters["?homeRegionID"] = homeRegionID.ToString();
-            parameters["?homeLocationX"] = homeLocX;
-            parameters["?homeLocationY"] = homeLocY;
-            parameters["?homeLocationZ"] = homeLocZ;
-            parameters["?homeLookAtX"] = homeLookAtX;
-            parameters["?homeLookAtY"] = homeLookAtY;
-            parameters["?homeLookAtZ"] = homeLookAtZ;
-            parameters["?created"] = created;
-            parameters["?lastLogin"] = lastlogin;
-            parameters["?userInventoryURI"] = inventoryURI;
-            parameters["?userAssetURI"] = assetURI;
-            parameters["?profileCanDoMask"] = canDoMask;
-            parameters["?profileWantDoMask"] = wantDoMask;
-            parameters["?profileAboutText"] = aboutText;
-            parameters["?profileFirstText"] = firstText;
-            parameters["?profileImage"] = profileImage.ToString();
-            parameters["?profileFirstImage"] = firstImage.ToString();
-            parameters["?webLoginKey"] = webLoginKey.ToString();
-            parameters["?userFlags"] = userFlags;
-            parameters["?godLevel"] = godLevel;
-            parameters["?customType"] = customType == null ? "" : customType;
-            parameters["?partner"] = partner.ToString();
-            bool returnval = false;
-                
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    if (result.ExecuteNonQuery() == 1)
-                        returnval = true;
-
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            //m_log.Debug("[MySQLManager]: Fetch user retval == " + returnval.ToString());
-            return returnval;
-        }
-
-        /// <summary>
-        /// Update user data into the database where User ID = uuid
-        /// </summary>
-        /// <param name="uuid">User ID</param>
-        /// <param name="username">First part of the login</param>
-        /// <param name="lastname">Second part of the login</param>
-        /// <param name="passwordHash">A salted hash of the users password</param>
-        /// <param name="passwordSalt">The salt used for the password hash</param>
-        /// <param name="homeRegion">A regionHandle of the users home region</param>
-        /// <param name="homeLocX">Home region position vector</param>
-        /// <param name="homeLocY">Home region position vector</param>
-        /// <param name="homeLocZ">Home region position vector</param>
-        /// <param name="homeLookAtX">Home region 'look at' vector</param>
-        /// <param name="homeLookAtY">Home region 'look at' vector</param>
-        /// <param name="homeLookAtZ">Home region 'look at' vector</param>
-        /// <param name="created">Account created (unix timestamp)</param>
-        /// <param name="lastlogin">Last login (unix timestamp)</param>
-        /// <param name="inventoryURI">Users inventory URI</param>
-        /// <param name="assetURI">Users asset URI</param>
-        /// <param name="canDoMask">I can do mask</param>
-        /// <param name="wantDoMask">I want to do mask</param>
-        /// <param name="aboutText">Profile text</param>
-        /// <param name="firstText">Firstlife text</param>
-        /// <param name="profileImage">UUID for profile image</param>
-        /// <param name="firstImage">UUID for firstlife image</param>
-        /// <param name="webLoginKey">UUID for weblogin Key</param>
-        /// <returns>Success?</returns>
-        public bool updateUserRow(UUID uuid, string username, string lastname, string email, string passwordHash,
-                                  string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
-                                  float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
-                                  string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
-                                  string aboutText, string firstText,
-                                  UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
-        {
-            string sql = "UPDATE users SET `username` = ?username , `lastname` = ?lastname, `email` = ?email ";
-            sql += ", `passwordHash` = ?passwordHash , `passwordSalt` = ?passwordSalt , ";
-            sql += "`homeRegion` = ?homeRegion , `homeRegionID` = ?homeRegionID, `homeLocationX` = ?homeLocationX , ";
-            sql += "`homeLocationY`  = ?homeLocationY , `homeLocationZ` = ?homeLocationZ , ";
-            sql += "`homeLookAtX` = ?homeLookAtX , `homeLookAtY` = ?homeLookAtY , ";
-            sql += "`homeLookAtZ` = ?homeLookAtZ , `created` = ?created , `lastLogin` = ?lastLogin , ";
-            sql += "`userInventoryURI` = ?userInventoryURI , `userAssetURI` = ?userAssetURI , ";
-            sql += "`profileCanDoMask` = ?profileCanDoMask , `profileWantDoMask` = ?profileWantDoMask , ";
-            sql += "`profileAboutText` = ?profileAboutText , `profileFirstText` = ?profileFirstText, ";
-            sql += "`profileImage` = ?profileImage , `profileFirstImage` = ?profileFirstImage , ";
-            sql += "`userFlags` = ?userFlags , `godLevel` = ?godLevel , ";
-            sql += "`customType` = ?customType , `partner` = ?partner , ";
-            sql += "`webLoginKey` = ?webLoginKey WHERE UUID = ?UUID";
-
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters["?UUID"] = uuid.ToString();
-            parameters["?username"] = username;
-            parameters["?lastname"] = lastname;
-            parameters["?email"] = email;
-            parameters["?passwordHash"] = passwordHash;
-            parameters["?passwordSalt"] = passwordSalt;
-            parameters["?homeRegion"] = homeRegion;
-            parameters["?homeRegionID"] = homeRegionID.ToString();
-            parameters["?homeLocationX"] = homeLocX;
-            parameters["?homeLocationY"] = homeLocY;
-            parameters["?homeLocationZ"] = homeLocZ;
-            parameters["?homeLookAtX"] = homeLookAtX;
-            parameters["?homeLookAtY"] = homeLookAtY;
-            parameters["?homeLookAtZ"] = homeLookAtZ;
-            parameters["?created"] = created;
-            parameters["?lastLogin"] = lastlogin;
-            parameters["?userInventoryURI"] = inventoryURI;
-            parameters["?userAssetURI"] = assetURI;
-            parameters["?profileCanDoMask"] = canDoMask;
-            parameters["?profileWantDoMask"] = wantDoMask;
-            parameters["?profileAboutText"] = aboutText;
-            parameters["?profileFirstText"] = firstText;
-            parameters["?profileImage"] = profileImage.ToString();
-            parameters["?profileFirstImage"] = firstImage.ToString();
-            parameters["?webLoginKey"] = webLoginKey.ToString();
-            parameters["?userFlags"] = userFlags;
-            parameters["?godLevel"] = godLevel;
-            parameters["?customType"] = customType == null ? "" : customType;
-            parameters["?partner"] = partner.ToString();
-
-            bool returnval = false;
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    if (result.ExecuteNonQuery() == 1)
-                        returnval = true;
-
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            //m_log.Debug("[MySQLManager]: update user retval == " + returnval.ToString());
-            return returnval;
-        }
-
-        /// <summary>
-        /// Inserts a new region into the database
-        /// </summary>
-        /// <param name="regiondata">The region to insert</param>
-        /// <returns>Success?</returns>
-        public bool insertRegion(RegionProfileData regiondata)
-        {
-            bool GRID_ONLY_UPDATE_NECESSARY_DATA = false;
-
-            string sql = String.Empty;
-            if (GRID_ONLY_UPDATE_NECESSARY_DATA)
-            {
-                sql += "INSERT INTO ";
-            }
-            else
-            {
-                sql += "REPLACE INTO ";
-            }
-
-            sql += "regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql +=
-                "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
-
-            // part of an initial brutish effort to provide accurate information (as per the xml region spec)
-            // wrt the ownership of a given region
-            // the (very bad) assumption is that this value is being read and handled inconsistently or
-            // not at all. Current strategy is to put the code in place to support the validity of this information
-            // and to roll forward debugging any issues from that point
-            //
-            // this particular section of the mod attempts to implement the commit of a supplied value
-            // server for the UUID of the region's owner (master avatar). It consists of the addition of the column and value to the relevant sql,
-            // as well as the related parameterization
-            sql +=
-                "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort, owner_uuid, originUUID, access) VALUES ";
-
-            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
-            sql +=
-                "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
-            sql +=
-                "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey, ?regionMapTexture, ?serverHttpPort, ?serverRemotingPort, ?owner_uuid, ?originUUID, ?access)";
-
-            if (GRID_ONLY_UPDATE_NECESSARY_DATA)
-            {
-                sql += "ON DUPLICATE KEY UPDATE serverIP = ?serverIP, serverPort = ?serverPort, serverURI = ?serverURI, owner_uuid - ?owner_uuid;";
-            }
-            else
-            {
-                sql += ";";
-            }
-
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-
-            parameters["?regionHandle"] = regiondata.regionHandle.ToString();
-            parameters["?regionName"] = regiondata.regionName.ToString();
-            parameters["?uuid"] = regiondata.UUID.ToString();
-            parameters["?regionRecvKey"] = regiondata.regionRecvKey.ToString();
-            parameters["?regionSecret"] = regiondata.regionSecret.ToString();
-            parameters["?regionSendKey"] = regiondata.regionSendKey.ToString();
-            parameters["?regionDataURI"] = regiondata.regionDataURI.ToString();
-            parameters["?serverIP"] = regiondata.serverIP.ToString();
-            parameters["?serverPort"] = regiondata.serverPort.ToString();
-            parameters["?serverURI"] = regiondata.serverURI.ToString();
-            parameters["?locX"] = regiondata.regionLocX.ToString();
-            parameters["?locY"] = regiondata.regionLocY.ToString();
-            parameters["?locZ"] = regiondata.regionLocZ.ToString();
-            parameters["?eastOverrideHandle"] = regiondata.regionEastOverrideHandle.ToString();
-            parameters["?westOverrideHandle"] = regiondata.regionWestOverrideHandle.ToString();
-            parameters["?northOverrideHandle"] = regiondata.regionNorthOverrideHandle.ToString();
-            parameters["?southOverrideHandle"] = regiondata.regionSouthOverrideHandle.ToString();
-            parameters["?regionAssetURI"] = regiondata.regionAssetURI.ToString();
-            parameters["?regionAssetRecvKey"] = regiondata.regionAssetRecvKey.ToString();
-            parameters["?regionAssetSendKey"] = regiondata.regionAssetSendKey.ToString();
-            parameters["?regionUserURI"] = regiondata.regionUserURI.ToString();
-            parameters["?regionUserRecvKey"] = regiondata.regionUserRecvKey.ToString();
-            parameters["?regionUserSendKey"] = regiondata.regionUserSendKey.ToString();
-            parameters["?regionMapTexture"] = regiondata.regionMapTextureID.ToString();
-            parameters["?serverHttpPort"] = regiondata.httpPort.ToString();
-            parameters["?serverRemotingPort"] = regiondata.remotingPort.ToString();
-            parameters["?owner_uuid"] = regiondata.owner_uuid.ToString();
-            parameters["?originUUID"] = regiondata.originUUID.ToString();
-            parameters["?access"] = regiondata.maturity.ToString();
-
-            bool returnval = false;
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    // int x;
-                    // if ((x = result.ExecuteNonQuery()) > 0)
-                    // {
-                    //     returnval = true;
-                    // }
-                    if (result.ExecuteNonQuery() > 0)
-                    {
-                        returnval = true;
-                    }
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            return returnval;
-        }
-
-        /// <summary>
-        /// Delete a region from the database
-        /// </summary>
-        /// <param name="uuid">The region to delete</param>
-        /// <returns>Success?</returns>
-        //public bool deleteRegion(RegionProfileData regiondata)
-        public bool deleteRegion(string uuid)
-        {
-            bool returnval = false;
-
-            string sql = "DELETE FROM regions WHERE uuid = ?uuid;";
-
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-
-            try
-            {
-                parameters["?uuid"] = uuid;
-
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    // int x;
-                    // if ((x = result.ExecuteNonQuery()) > 0)
-                    // {
-                    //     returnval = true;
-                    // }
-                    if (result.ExecuteNonQuery() > 0)
-                    {
-                        returnval = true;
-                    }
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            return returnval;
-        }
-
-        /// <summary>
-        /// Creates a new agent and inserts it into the database
-        /// </summary>
-        /// <param name="agentdata">The agent data to be inserted</param>
-        /// <returns>Success?</returns>
-        public bool insertAgentRow(UserAgentData agentdata)
-        {
-            string sql = String.Empty;
-            sql += "REPLACE INTO ";
-            sql += "agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos, currentLookAt) VALUES ";
-            sql += "(?UUID, ?sessionID, ?secureSessionID, ?agentIP, ?agentPort, ?agentOnline, ?loginTime, ?logoutTime, ?currentRegion, ?currentHandle, ?currentPos, ?currentLookAt);";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-
-            parameters["?UUID"] = agentdata.ProfileID.ToString();
-            parameters["?sessionID"] = agentdata.SessionID.ToString();
-            parameters["?secureSessionID"] = agentdata.SecureSessionID.ToString();
-            parameters["?agentIP"] = agentdata.AgentIP.ToString();
-            parameters["?agentPort"] = agentdata.AgentPort.ToString();
-            parameters["?agentOnline"] = (agentdata.AgentOnline == true) ? "1" : "0";
-            parameters["?loginTime"] = agentdata.LoginTime.ToString();
-            parameters["?logoutTime"] = agentdata.LogoutTime.ToString();
-            parameters["?currentRegion"] = agentdata.Region.ToString();
-            parameters["?currentHandle"] = agentdata.Handle.ToString();
-            parameters["?currentPos"] = "<" + (agentdata.Position.X).ToString().Replace(",", ".") + "," + (agentdata.Position.Y).ToString().Replace(",", ".") + "," + (agentdata.Position.Z).ToString().Replace(",", ".") + ">";
-            parameters["?currentLookAt"] = "<" + (agentdata.LookAt.X).ToString().Replace(",", ".") + "," + (agentdata.LookAt.Y).ToString().Replace(",", ".") + "," + (agentdata.LookAt.Z).ToString().Replace(",", ".") + ">";
-
-            bool returnval = false;
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    IDbCommand result = Query(dbcon, sql, parameters);
-
-                    // int x;
-                    // if ((x = result.ExecuteNonQuery()) > 0)
-                    // {
-                    //     returnval = true;
-                    // }
-                    if (result.ExecuteNonQuery() > 0)
-                    {
-                        returnval = true;
-                    }
-                    result.Dispose();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            return returnval;
-        }
-
-        /// <summary>
-        /// Create (or replace if existing) an avatar appearence
-        /// </summary>
-        /// <param name="appearance"></param>
-        /// <returns>Succes?</returns>
-        public bool insertAppearanceRow(AvatarAppearance appearance)
-        {
-            string sql = String.Empty;
-            sql += "REPLACE INTO ";
-            sql += "avatarappearance (owner, serial, visual_params, texture, avatar_height, ";
-            sql += "body_item, body_asset, skin_item, skin_asset, hair_item, hair_asset, eyes_item, eyes_asset, ";
-            sql += "shirt_item, shirt_asset, pants_item, pants_asset, shoes_item, shoes_asset, socks_item, socks_asset, ";
-            sql += "jacket_item, jacket_asset, gloves_item, gloves_asset, undershirt_item, undershirt_asset, underpants_item, underpants_asset, ";
-            sql += "skirt_item, skirt_asset) values (";
-            sql += "?owner, ?serial, ?visual_params, ?texture, ?avatar_height, ";
-            sql += "?body_item, ?body_asset, ?skin_item, ?skin_asset, ?hair_item, ?hair_asset, ?eyes_item, ?eyes_asset, ";
-            sql += "?shirt_item, ?shirt_asset, ?pants_item, ?pants_asset, ?shoes_item, ?shoes_asset, ?socks_item, ?socks_asset, ";
-            sql += "?jacket_item, ?jacket_asset, ?gloves_item, ?gloves_asset, ?undershirt_item, ?undershirt_asset, ?underpants_item, ?underpants_asset, ";
-            sql += "?skirt_item, ?skirt_asset)";
-
-            bool returnval = false;
-
-            // we want to send in byte data, which means we can't just pass down strings
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-                {
-                    dbcon.Open();
-
-                    using (MySqlCommand cmd = (MySqlCommand)dbcon.CreateCommand())
-                    {
-                        cmd.CommandText = sql;
-                        cmd.Parameters.AddWithValue("?owner", appearance.Owner.ToString());
-                        cmd.Parameters.AddWithValue("?serial", appearance.Serial);
-                        cmd.Parameters.AddWithValue("?visual_params", appearance.VisualParams);
-                        cmd.Parameters.AddWithValue("?texture", appearance.Texture.GetBytes());
-                        cmd.Parameters.AddWithValue("?avatar_height", appearance.AvatarHeight);
-                        cmd.Parameters.AddWithValue("?body_item", appearance.BodyItem.ToString());
-                        cmd.Parameters.AddWithValue("?body_asset", appearance.BodyAsset.ToString());
-                        cmd.Parameters.AddWithValue("?skin_item", appearance.SkinItem.ToString());
-                        cmd.Parameters.AddWithValue("?skin_asset", appearance.SkinAsset.ToString());
-                        cmd.Parameters.AddWithValue("?hair_item", appearance.HairItem.ToString());
-                        cmd.Parameters.AddWithValue("?hair_asset", appearance.HairAsset.ToString());
-                        cmd.Parameters.AddWithValue("?eyes_item", appearance.EyesItem.ToString());
-                        cmd.Parameters.AddWithValue("?eyes_asset", appearance.EyesAsset.ToString());
-                        cmd.Parameters.AddWithValue("?shirt_item", appearance.ShirtItem.ToString());
-                        cmd.Parameters.AddWithValue("?shirt_asset", appearance.ShirtAsset.ToString());
-                        cmd.Parameters.AddWithValue("?pants_item", appearance.PantsItem.ToString());
-                        cmd.Parameters.AddWithValue("?pants_asset", appearance.PantsAsset.ToString());
-                        cmd.Parameters.AddWithValue("?shoes_item", appearance.ShoesItem.ToString());
-                        cmd.Parameters.AddWithValue("?shoes_asset", appearance.ShoesAsset.ToString());
-                        cmd.Parameters.AddWithValue("?socks_item", appearance.SocksItem.ToString());
-                        cmd.Parameters.AddWithValue("?socks_asset", appearance.SocksAsset.ToString());
-                        cmd.Parameters.AddWithValue("?jacket_item", appearance.JacketItem.ToString());
-                        cmd.Parameters.AddWithValue("?jacket_asset", appearance.JacketAsset.ToString());
-                        cmd.Parameters.AddWithValue("?gloves_item", appearance.GlovesItem.ToString());
-                        cmd.Parameters.AddWithValue("?gloves_asset", appearance.GlovesAsset.ToString());
-                        cmd.Parameters.AddWithValue("?undershirt_item", appearance.UnderShirtItem.ToString());
-                        cmd.Parameters.AddWithValue("?undershirt_asset", appearance.UnderShirtAsset.ToString());
-                        cmd.Parameters.AddWithValue("?underpants_item", appearance.UnderPantsItem.ToString());
-                        cmd.Parameters.AddWithValue("?underpants_asset", appearance.UnderPantsAsset.ToString());
-                        cmd.Parameters.AddWithValue("?skirt_item", appearance.SkirtItem.ToString());
-                        cmd.Parameters.AddWithValue("?skirt_asset", appearance.SkirtAsset.ToString());
-
-                        if (cmd.ExecuteNonQuery() > 0)
-                            returnval = true;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
-            return returnval;
-
-        }
-
-        public void writeAttachments(UUID agentID, Hashtable data)
-        {
-            string sql = "delete from avatarattachments where UUID = ?uuid";
-
-            using (MySqlConnection dbcon = new MySqlConnection(connectionString))
-            {
-                dbcon.Open();
-
-                MySqlCommand cmd = (MySqlCommand)dbcon.CreateCommand();
-                cmd.CommandText = sql;
-                cmd.Parameters.AddWithValue("?uuid", agentID.ToString());
-
-                cmd.ExecuteNonQuery();
-
-                if (data == null)
-                    return;
-
-                sql = "insert into avatarattachments (UUID, attachpoint, item, asset) values (?uuid, ?attachpoint, ?item, ?asset)";
-
-                cmd = (MySqlCommand)dbcon.CreateCommand();
-                cmd.CommandText = sql;
-
-                foreach (DictionaryEntry e in data)
-                {
-                    int attachpoint = Convert.ToInt32(e.Key);
-
-                    Hashtable item = (Hashtable)e.Value;
-
-                    cmd.Parameters.Clear();
-                    cmd.Parameters.AddWithValue("?uuid", agentID.ToString());
-                    cmd.Parameters.AddWithValue("?attachpoint", attachpoint);
-                    cmd.Parameters.AddWithValue("?item", item["item"]);
-                    cmd.Parameters.AddWithValue("?asset", item["asset"]);
-
-                    cmd.ExecuteNonQuery();
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
new file mode 100644
index 0000000..143dbe3
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for the Grid Server
+    /// </summary>
+    public class MySQLPresenceData : MySQLGenericTableHandler<PresenceData>,
+            IPresenceData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public MySQLPresenceData(string connectionString, string realm) :
+                base(connectionString, realm, "Presence")
+        {
+        }
+
+        public PresenceData Get(UUID sessionID)
+        {
+            PresenceData[] ret = Get("SessionID",
+                    sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("update {0} set Online='false' where `RegionID`=?RegionID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+
+            ExecuteNonQuery(cmd);
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, string position,
+                string lookAt)
+        {
+            PresenceData[] pd = Get("SessionID", sessionID.ToString());
+            if (pd.Length == 0)
+                return false;
+
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, Position=?Position, LookAt=?LookAt, Online='true' where `SessionID`=?SessionID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue("?Position", position.ToString());
+            cmd.Parameters.AddWithValue("?LookAt", lookAt.ToString());
+
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
+
+            return true;
+        }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            PresenceData[] pd = Get("UserID", userID);
+            if (pd.Length == 0)
+                return false;
+
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("update {0} set HomeRegionID=?HomeRegionID, HomePosition=?HomePosition, HomeLookAt=?HomeLookAt where UserID=?UserID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?UserID", userID);
+            cmd.Parameters.AddWithValue("?HomeRegionID", regionID.ToString());
+            cmd.Parameters.AddWithValue("?HomePosition", position);
+            cmd.Parameters.AddWithValue("?HomeLookAt", lookAt);
+
+            if (ExecuteNonQuery(cmd) == 0)
+                return false;
+
+            return true;
+        }
+
+        public void Prune(string userID)
+        {
+            MySqlCommand cmd = new MySqlCommand();
+
+            cmd.CommandText = String.Format("select * from {0} where UserID=?UserID", m_Realm);
+
+            cmd.Parameters.AddWithValue("?UserID", userID);
+
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            { 
+                dbcon.Open();
+
+                cmd.Connection = dbcon;
+
+                using (IDataReader reader = cmd.ExecuteReader())
+                {
+                    List<UUID> deleteSessions = new List<UUID>();
+                    int online = 0;
+
+                    while (reader.Read())
+                    {
+                        if (bool.Parse(reader["Online"].ToString()))
+                            online++;
+                        else
+                            deleteSessions.Add(new UUID(reader["SessionID"].ToString()));
+                    }
+
+                    // Leave one session behind so that we can pick up details such as home location
+                    if (online == 0 && deleteSessions.Count > 0)
+                        deleteSessions.RemoveAt(0);
+
+                    foreach (UUID s in deleteSessions)
+                        Delete("SessionID", s.ToString());
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index a1a08b1..aa9a104 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -283,5 +283,31 @@ namespace OpenSim.Data.MySQL
 
             return false;
         }
+        public List<RegionData> GetDefaultRegions(UUID scopeID)
+        {
+            string command = "select * from `"+m_Realm+"` where (flags & 1) <> 0";
+            if (scopeID != UUID.Zero)
+                command += " and ScopeID = ?scopeID";
+
+            MySqlCommand cmd = new MySqlCommand(command);
+
+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+            return RunCommand(cmd);
+        }
+
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            string command = "select * from `"+m_Realm+"` where (flags & 2) <> 0";
+            if (scopeID != UUID.Zero)
+                command += " and ScopeID = ?scopeID";
+
+            MySqlCommand cmd = new MySqlCommand(command);
+
+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+            // TODO: distance-sort results
+            return RunCommand(cmd);
+        }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index 3cb0010..aa69d68 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -35,150 +35,50 @@ using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL
 {
-    public class MySqlUserAccountData : MySqlFramework, IUserAccountData
+    public class MySqlUserAccountData : MySQLGenericTableHandler<UserAccountData>, IUserAccountData
     {
-        private string m_Realm;
-        private List<string> m_ColumnNames;
-        // private string m_connectionString;
-
         public MySqlUserAccountData(string connectionString, string realm)
-                : base(connectionString)
-        {
-            m_Realm = realm;
-            m_connectionString = connectionString;
-
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, GetType().Assembly, "UserStore");
-                m.Update();
-            }
-        }
-
-        public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
+                : base(connectionString, realm, "UserAccount")
         {
-            return null;
         }
 
-        public UserAccountData Get(UUID principalID, UUID scopeID)
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
         {
-            UserAccountData ret = new UserAccountData();
-            ret.Data = new Dictionary<string, object>();
-
-            string command = "select * from `"+m_Realm+"` where UUID = ?principalID";
-            if (scopeID != UUID.Zero)
-                command += " and ScopeID = ?scopeID";
+            string[] words = query.Split(new char[] {' '});
 
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            for (int i = 0 ; i < words.Length ; i++)
             {
-                dbcon.Open();
-                MySqlCommand cmd = new MySqlCommand(command, dbcon);
-
-                cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
-                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-
-                IDataReader result = cmd.ExecuteReader();
-
-                if (result.Read())
+                if (words[i].Length < 3)
                 {
-                    ret.PrincipalID = principalID;
-                    UUID scope;
-                    UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                    ret.ScopeID = scope;
-
-                    if (m_ColumnNames == null)
-                    {
-                        m_ColumnNames = new List<string>();
-
-                        DataTable schemaTable = result.GetSchemaTable();
-                        foreach (DataRow row in schemaTable.Rows)
-                            m_ColumnNames.Add(row["ColumnName"].ToString());
-                    }
-
-                    foreach (string s in m_ColumnNames)
-                    {
-                        if (s == "UUID")
-                            continue;
-                        if (s == "ScopeID")
-                            continue;
-
-                        ret.Data[s] = result[s].ToString();
-                    }
-
-                    return ret;
-                }
-                else
-                {
-                    return null;
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
                 }
             }
-        }
 
-        public bool Store(UserAccountData data)
-        {
-            if (data.Data.ContainsKey("UUID"))
-                data.Data.Remove("UUID");
-            if (data.Data.ContainsKey("ScopeID"))
-                data.Data.Remove("ScopeID");
-
-            string[] fields = new List<string>(data.Data.Keys).ToArray();
-
-            using (MySqlCommand cmd = new MySqlCommand())
-            {
-                string update = "update `" + m_Realm + "` set ";
-                bool first = true;
-                foreach (string field in fields)
-                {
-                    if (!first)
-                        update += ", ";
-                    update += "`" + field + "` = ?" + field;
+            if (words.Length == 0)
+                return new UserAccountData[0];
 
-                    first = false;
+            if (words.Length > 2)
+                return new UserAccountData[0];
 
-                    cmd.Parameters.AddWithValue("?" + field, data.Data[field]);
-                }
-
-                update += " where UUID = ?principalID";
-
-                if (data.ScopeID != UUID.Zero)
-                    update += " and ScopeID = ?scopeID";
+            MySqlCommand cmd = new MySqlCommand();
 
-                cmd.CommandText = update;
-                cmd.Parameters.AddWithValue("?principalID", data.PrincipalID.ToString());
-                cmd.Parameters.AddWithValue("?scopeID", data.ScopeID.ToString());
-
-                if (ExecuteNonQuery(cmd) < 1)
-                {
-                    string insert = "insert into `" + m_Realm + "` (`UUID`, `ScopeID`, `" +
-                            String.Join("`, `", fields) +
-                            "`) values (?principalID, ?scopeID, ?" + String.Join(", ?", fields) + ")";
-
-                    cmd.CommandText = insert;
-
-                    if (ExecuteNonQuery(cmd) < 1)
-                    {
-                        cmd.Dispose();
-                        return false;
-                    }
-                }
+            if (words.Length == 1)
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
+                cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
-
-            return true;
-        }
-
-        public bool SetDataItem(UUID principalID, string item, string value)
-        {
-            using (MySqlCommand cmd = new MySqlCommand("update `" + m_Realm + "` set `" +
-                item + "` = ?" + item + " where UUID = ?UUID"))
+            else
             {
-                cmd.Parameters.AddWithValue("?" + item, value);
-                cmd.Parameters.AddWithValue("?UUID", principalID.ToString());
-
-                if (ExecuteNonQuery(cmd) > 0)
-                    return true;
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
+                cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
+                cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
             }
 
-            return false;
+            return DoQuery(cmd);
         }
     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
deleted file mode 100644
index 0a9d2e3..0000000
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ /dev/null
@@ -1,766 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using log4net;
-using MySql.Data.MySqlClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.MySQL
-{
-    /// <summary>
-    /// A database interface class to a user profile storage system
-    /// </summary>
-    public class MySQLUserData : UserDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private MySQLManager m_database;
-        private string m_connectionString;
-        private object m_dbLock = new object();
-
-        public int m_maxConnections = 10;
-        public int m_lastConnect;
-
-        private string m_agentsTableName = "agents";
-        private string m_usersTableName = "users";
-        private string m_userFriendsTableName = "userfriends";
-        private string m_appearanceTableName = "avatarappearance";
-        private string m_attachmentsTableName = "avatarattachments";
-
-        public override void Initialise()
-        {
-            m_log.Info("[MySQLUserData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException(Name);
-        }
-
-        /// <summary>
-        /// Initialise User Interface
-        /// Loads and initialises the MySQL storage plugin
-        /// Warns and uses the obsolete mysql_connection.ini if connect string is empty.
-        /// Checks for migration
-        /// </summary>
-        /// <param name="connect">connect string.</param>
-        public override void Initialise(string connect)
-        {
-            m_connectionString = connect;
-            m_database = new MySQLManager(connect);
-
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
-
-            using (MySql.Data.MySqlClient.MySqlConnection dbcon = new MySql.Data.MySqlClient.MySqlConnection(m_connectionString))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, assem, "UserStore");
-                m.Update();
-            }
-        }
-
-        public override void Dispose()
-        {
-        }
-
-        // see IUserDataPlugin
-        public override UserProfileData GetUserByName(string user, string last)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?first"] = user;
-                param["?second"] = last;
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon,
-                        "SELECT * FROM " + m_usersTableName + " WHERE username = ?first AND lastname = ?second", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            UserProfileData row = m_database.readUserRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        #region User Friends List Data
-
-        public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            int dtvalue = Util.UnixTimeSinceEpoch();
-
-            Dictionary<string, object> param = new Dictionary<string, object>();
-            param["?ownerID"] = friendlistowner.ToString();
-            param["?friendID"] = friend.ToString();
-            param["?friendPerms"] = perms.ToString();
-            param["?datetimestamp"] = dtvalue.ToString();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand adder = m_database.Query(dbcon,
-                        "INSERT INTO `" + m_userFriendsTableName + "` " +
-                        "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
-                        "VALUES " +
-                        "(?ownerID,?friendID,?friendPerms,?datetimestamp)",
-                        param))
-                    {
-                        adder.ExecuteNonQuery();
-                    }
-
-                    using (IDbCommand adder = m_database.Query(dbcon,
-                        "INSERT INTO `" + m_userFriendsTableName + "` " +
-                        "(`ownerID`,`friendID`,`friendPerms`,`datetimestamp`) " +
-                        "VALUES " +
-                        "(?friendID,?ownerID,?friendPerms,?datetimestamp)",
-                        param))
-                    {
-                        adder.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return;
-            }
-        }
-
-        public override void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            Dictionary<string, object> param = new Dictionary<string, object>();
-            param["?ownerID"] = friendlistowner.ToString();
-            param["?friendID"] = friend.ToString();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand updater = m_database.Query(dbcon,
-                            "delete from " + m_userFriendsTableName + " where ownerID = ?ownerID and friendID = ?friendID",
-                            param))
-                    {
-                        updater.ExecuteNonQuery();
-                    }
-
-                    using (IDbCommand updater = m_database.Query(dbcon,
-                            "delete from " + m_userFriendsTableName + " where ownerID = ?friendID and friendID = ?ownerID",
-                            param))
-                    {
-                        updater.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return;
-            }
-        }
-
-        public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            Dictionary<string, object> param = new Dictionary<string, object>();
-            param["?ownerID"] = friendlistowner.ToString();
-            param["?friendID"] = friend.ToString();
-            param["?friendPerms"] = perms.ToString();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand updater = m_database.Query(dbcon,
-                            "update " + m_userFriendsTableName +
-                            " SET friendPerms = ?friendPerms " +
-                            "where ownerID = ?ownerID and friendID = ?friendID",
-                            param))
-                    {
-                        updater.ExecuteNonQuery();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return;
-            }
-        }
-
-        public override List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            List<FriendListItem> Lfli = new List<FriendListItem>();
-
-            Dictionary<string, object> param = new Dictionary<string, object>();
-            param["?ownerID"] = friendlistowner.ToString();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    //Left Join userfriends to itself
-                    using (IDbCommand result = m_database.Query(dbcon,
-                        "select a.ownerID,a.friendID,a.friendPerms,b.friendPerms as ownerperms from " +
-                        m_userFriendsTableName + " as a, " + m_userFriendsTableName + " as b" +
-                        " where a.ownerID = ?ownerID and b.ownerID = a.friendID and b.friendID = a.ownerID",
-                        param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            while (reader.Read())
-                            {
-                                FriendListItem fli = new FriendListItem();
-                                fli.FriendListOwner = new UUID((string)reader["ownerID"]);
-                                fli.Friend = new UUID((string)reader["friendID"]);
-                                fli.FriendPerms = (uint)Convert.ToInt32(reader["friendPerms"]);
-
-                                // This is not a real column in the database table, it's a joined column from the opposite record
-                                fli.FriendListOwnerPerms = (uint)Convert.ToInt32(reader["ownerperms"]);
-
-                                Lfli.Add(fli);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return Lfli;
-            }
-
-            return Lfli;
-        }
-
-        override public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
-        {
-            Dictionary<UUID, FriendRegionInfo> infos = new Dictionary<UUID,FriendRegionInfo>();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    foreach (UUID uuid in uuids)
-                    {
-                        Dictionary<string, object> param = new Dictionary<string, object>();
-                        param["?uuid"] = uuid.ToString();
-
-                        using (IDbCommand result = m_database.Query(dbcon, "select agentOnline,currentHandle from " + m_agentsTableName +
-                                              " where UUID = ?uuid", param))
-                        {
-                            using (IDataReader reader = result.ExecuteReader())
-                            {
-                                while (reader.Read())
-                                {
-                                    FriendRegionInfo fri = new FriendRegionInfo();
-                                    fri.isOnline = (sbyte)reader["agentOnline"] != 0;
-                                    fri.regionHandle = (ulong)reader["currentHandle"];
-
-                                    infos[uuid] = fri;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[MYSQL]: Got exception on trying to find friends regions:", e);
-                m_log.Error(e.Message, e);
-            }
-
-            return infos;
-        }
-
-        #endregion
-
-        public override List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
-
-            Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
-
-            string[] querysplit;
-            querysplit = query.Split(' ');
-            if (querysplit.Length > 1 && querysplit[1].Trim() != String.Empty)
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
-                param["?second"] = objAlphaNumericPattern.Replace(querysplit[1], String.Empty) + "%";
-
-                try
-                {
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                    {
-                        dbcon.Open();
-
-                        using (IDbCommand result = m_database.Query(dbcon,
-                            "SELECT UUID,username,lastname FROM " + m_usersTableName +
-                            " WHERE username like ?first AND lastname like ?second LIMIT 100",
-                            param))
-                        {
-                            using (IDataReader reader = result.ExecuteReader())
-                            {
-                                while (reader.Read())
-                                {
-                                    AvatarPickerAvatar user = new AvatarPickerAvatar();
-                                    user.AvatarID = new UUID((string)reader["UUID"]);
-                                    user.firstName = (string)reader["username"];
-                                    user.lastName = (string)reader["lastname"];
-                                    returnlist.Add(user);
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.Message, e);
-                    return returnlist;
-                }
-            }
-            else
-            {
-                try
-                {
-                    Dictionary<string, object> param = new Dictionary<string, object>();
-                    param["?first"] = objAlphaNumericPattern.Replace(querysplit[0], String.Empty) + "%";
-
-                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                    {
-                        dbcon.Open();
-
-                        using (IDbCommand result = m_database.Query(dbcon,
-                            "SELECT UUID,username,lastname FROM " + m_usersTableName +
-                            " WHERE username like ?first OR lastname like ?first LIMIT 100",
-                            param))
-                        {
-                            using (IDataReader reader = result.ExecuteReader())
-                            {
-                                while (reader.Read())
-                                {
-                                    AvatarPickerAvatar user = new AvatarPickerAvatar();
-                                    user.AvatarID = new UUID((string)reader["UUID"]);
-                                    user.firstName = (string)reader["username"];
-                                    user.lastName = (string)reader["lastname"];
-                                    returnlist.Add(user);
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error(e.Message, e);
-                    return returnlist;
-                }
-            }
-            return returnlist;
-        }
-
-        /// <summary>
-        /// See IUserDataPlugin
-        /// </summary>
-        /// <param name="uuid">User UUID</param>
-        /// <returns>User profile data</returns>
-        public override UserProfileData GetUserByUUID(UUID uuid)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?uuid"] = uuid.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon, "SELECT * FROM " + m_usersTableName + " WHERE UUID = ?uuid", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            UserProfileData row = m_database.readUserRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a user session searching by name
-        /// </summary>
-        /// <param name="name">The account name : "Username Lastname"</param>
-        /// <returns>The users session</returns>
-        public override UserAgentData GetAgentByName(string name)
-        {
-            return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-
-        /// <summary>
-        /// Returns a user session by account name
-        /// </summary>
-        /// <param name="user">First part of the users account name</param>
-        /// <param name="last">Second part of the users account name</param>
-        /// <returns>The users session</returns>
-        public override UserAgentData GetAgentByName(string user, string last)
-        {
-            UserProfileData profile = GetUserByName(user, last);
-            return GetAgentByUUID(profile.ID);
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="AgentID"></param>
-        /// <param name="WebLoginKey"></param>
-        /// <remarks>is it still used ?</remarks>
-        public override void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?UUID"] = AgentID.ToString();
-            param["?webLoginKey"] = WebLoginKey.ToString();
-
-            try
-            {
-                m_database.ExecuteParameterizedSql(
-                    "update " + m_usersTableName + " SET webLoginKey = ?webLoginKey " +
-                    "where UUID = ?UUID",
-                    param);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// Returns an agent session by account UUID
-        /// </summary>
-        /// <param name="uuid">The accounts UUID</param>
-        /// <returns>The users session</returns>
-        public override UserAgentData GetAgentByUUID(UUID uuid)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?uuid"] = uuid.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon, "SELECT * FROM " + m_agentsTableName + " WHERE UUID = ?uuid", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            UserAgentData row = m_database.readAgentRow(reader);
-                            return row;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new users profile
-        /// </summary>
-        /// <param name="user">The user profile to create</param>
-        public override void AddNewUserProfile(UserProfileData user)
-        {
-            UUID zero = UUID.Zero;
-            if (user.ID == zero)
-            {
-                return;
-            }
-
-            try
-            {
-                m_database.insertUserRow(
-                    user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
-                    user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
-                    user.HomeLocation.Z,
-                    user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
-                    user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
-                    user.CanDoMask, user.WantDoMask,
-                    user.AboutText, user.FirstLifeAboutText, user.Image,
-                    user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Creates a new agent
-        /// </summary>
-        /// <param name="agent">The agent to create</param>
-        public override void AddNewUserAgent(UserAgentData agent)
-        {
-            UUID zero = UUID.Zero;
-            if (agent.ProfileID == zero || agent.SessionID == zero)
-                return;
-
-            try
-            {
-                m_database.insertAgentRow(agent);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Updates a user profile stored in the DB
-        /// </summary>
-        /// <param name="user">The profile data to use to update the DB</param>
-        public override bool UpdateUserProfile(UserProfileData user)
-        {
-            try
-            {
-                m_database.updateUserRow(
-                    user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
-                    user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
-                    user.HomeLocation.Z, user.HomeLookAt.X,
-                    user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin,
-                    user.UserInventoryURI,
-                    user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
-                    user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey,
-                    user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Performs a money transfer request between two accounts
-        /// </summary>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The receivers account ID</param>
-        /// <param name="amount">The amount to transfer</param>
-        /// <returns>Success?</returns>
-        public override bool MoneyTransferRequest(UUID from, UUID to, uint amount)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Performs an inventory transfer request between two accounts
-        /// </summary>
-        /// <remarks>TODO: Move to inventory server</remarks>
-        /// <param name="from">The senders account ID</param>
-        /// <param name="to">The receivers account ID</param>
-        /// <param name="item">The item to transfer</param>
-        /// <returns>Success?</returns>
-        public override bool InventoryTransferRequest(UUID from, UUID to, UUID item)
-        {
-            return false;
-        }
-
-        public override AvatarAppearance GetUserAppearance(UUID user)
-        {
-            try
-            {
-                Dictionary<string, object> param = new Dictionary<string, object>();
-                param["?owner"] = user.ToString();
-
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon, "SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            AvatarAppearance appearance = m_database.readAppearanceRow(reader);
-
-                            if (appearance == null)
-                            {
-                                m_log.WarnFormat("[USER DB] No appearance found for user {0}", user.ToString());
-                                return null;
-                            }
-                            else
-                            {
-                                appearance.SetAttachments(GetUserAttachments(user));
-                                return appearance;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Updates an avatar appearence
-        /// </summary>
-        /// <param name="user">The user UUID</param>
-        /// <param name="appearance">The avatar appearance</param>
-        // override
-        public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
-        {
-            try
-            {
-                appearance.Owner = user;
-                m_database.insertAppearanceRow(appearance);
-
-                UpdateUserAttachments(user, appearance.GetAttachments());
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Database provider name
-        /// </summary>
-        /// <returns>Provider name</returns>
-        public override string Name
-        {
-            get { return "MySQL Userdata Interface"; }
-        }
-
-        /// <summary>
-        /// Database provider version
-        /// </summary>
-        /// <returns>provider version</returns>
-        public override string Version
-        {
-            get { return "0.1"; }
-        }
-
-        public Hashtable GetUserAttachments(UUID agentID)
-        {
-            Dictionary<string, object> param = new Dictionary<string, object>();
-            param["?uuid"] = agentID.ToString();
-
-            try
-            {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
-
-                    using (IDbCommand result = m_database.Query(dbcon,
-                        "SELECT attachpoint, item, asset from " + m_attachmentsTableName + " WHERE UUID = ?uuid", param))
-                    {
-                        using (IDataReader reader = result.ExecuteReader())
-                        {
-                            Hashtable ret = m_database.readAttachments(reader);
-                            return ret;
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return null;
-            }
-        }
-
-        public void UpdateUserAttachments(UUID agentID, Hashtable data)
-        {
-            m_database.writeAttachments(agentID, data);
-        }
-
-        public override void ResetAttachments(UUID userID)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?uuid"] = userID.ToString();
-
-            m_database.ExecuteParameterizedSql(
-                "UPDATE " + m_attachmentsTableName +
-                " SET asset = '00000000-0000-0000-0000-000000000000' WHERE UUID = ?uuid",
-                param);
-        }
-
-        public override void LogoutUsers(UUID regionID)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["?regionID"] = regionID.ToString();
-
-            try
-            {
-                m_database.ExecuteParameterizedSql(
-                    "update " + m_agentsTableName + " SET agentOnline = 0 " +
-                    "where currentRegion = ?regionID",
-                    param);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.Message, e);
-                return;
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/Resources/001_Avatar.sql b/OpenSim/Data/MySQL/Resources/001_Avatar.sql
new file mode 100644
index 0000000..27a3072
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_Avatar.sql
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..e158a2c
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_Friends.sql
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000..da2c59c
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_FriendsStore.sql
@@ -0,0 +1,5 @@
+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_Presence.sql b/OpenSim/Data/MySQL/Resources/001_Presence.sql
new file mode 100644
index 0000000..b8abaf7
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_Presence.sql
@@ -0,0 +1,15 @@
+BEGIN;
+
+CREATE TABLE `Presence` (
+    `UserID` VARCHAR(255) NOT NULL,
+    `RegionID` CHAR(36) NOT NULL,
+    `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    `Online` CHAR(5) NOT NULL DEFAULT 'false',
+    `Login` CHAR(16) NOT NULL DEFAULT '0',
+    `Logout` CHAR(16) NOT NULL DEFAULT '0',
+    `Position` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
+    `LookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>'
+) ENGINE=InnoDB;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/001_UserAccount.sql b/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
new file mode 100644
index 0000000..07da571
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_UserAccount.sql
@@ -0,0 +1,13 @@
+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_AuthStore.sql b/OpenSim/Data/MySQL/Resources/002_AuthStore.sql
new file mode 100644
index 0000000..dc7dfe0
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_AuthStore.sql
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..5ff6438
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_Friends.sql
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..a363867
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_FriendsStore.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_Presence.sql b/OpenSim/Data/MySQL/Resources/002_Presence.sql
new file mode 100644
index 0000000..e65f105
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_Presence.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+ALTER TABLE Presence ADD COLUMN `HomeRegionID` CHAR(36) NOT NULL;
+ALTER TABLE Presence ADD COLUMN `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
+ALTER TABLE Presence ADD COLUMN `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>';
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/002_UserAccount.sql b/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
new file mode 100644
index 0000000..ad2ddda
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/002_UserAccount.sql
@@ -0,0 +1,5 @@
+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/003_AuthStore.sql b/OpenSim/Data/MySQL/Resources/003_AuthStore.sql
new file mode 100644
index 0000000..af9ffe6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/003_AuthStore.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE `auth` ADD COLUMN `accountType` VARCHAR(32) NOT NULL DEFAULT 'UserAccount';
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_Presence.sql b/OpenSim/Data/MySQL/Resources/003_Presence.sql
new file mode 100644
index 0000000..0efefa8
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/003_Presence.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
+CREATE INDEX UserID ON Presence(UserID);
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/003_UserAccount.sql b/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
new file mode 100644
index 0000000..e42d93b
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/003_UserAccount.sql
@@ -0,0 +1,9 @@
+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/004_UserAccount.sql b/OpenSim/Data/MySQL/Resources/004_UserAccount.sql
new file mode 100644
index 0000000..8abcd53
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/004_UserAccount.sql
@@ -0,0 +1,8 @@
+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/005_GridStore.sql b/OpenSim/Data/MySQL/Resources/005_GridStore.sql
new file mode 100644
index 0000000..835ba89
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/005_GridStore.sql
@@ -0,0 +1,6 @@
+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/006_GridStore.sql b/OpenSim/Data/MySQL/Resources/006_GridStore.sql
new file mode 100644
index 0000000..91322d6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/006_GridStore.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE `regions` ADD COLUMN `last_seen` integer NOT NULL DEFAULT 0;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/007_GridStore.sql b/OpenSim/Data/MySQL/Resources/007_GridStore.sql
new file mode 100644
index 0000000..dbec584
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/007_GridStore.sql
@@ -0,0 +1,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/032_RegionStore.sql b/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
index b10ffcf..02ac1f5 100644
--- a/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
+++ b/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
@@ -67,4 +67,5 @@ CREATE TABLE `regionwindlight` (
   PRIMARY KEY (`region_id`)
 );
 
-COMMIT;
\ No newline at end of file
+ALTER TABLE estate_settings AUTO_INCREMENT = 100;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index e1d3f81..a46fdf8 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -31,6 +31,7 @@ using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
 using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -39,7 +40,7 @@ namespace OpenSim.Data.MySQL.Tests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public string file;
-        public MySQLManager database;
+        private string m_connectionString;
         public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
         
         [TestFixtureSetUp]
@@ -52,7 +53,6 @@ namespace OpenSim.Data.MySQL.Tests
             // tests.
             try 
             {
-                database = new MySQLManager(connect);
                 db = new MySQLAssetData();
                 db.Initialise(connect);
             } 
@@ -70,10 +70,22 @@ namespace OpenSim.Data.MySQL.Tests
             {
                 db.Dispose();
             }
-            if (database != null)
+            ExecuteSql("drop table migrations");
+            ExecuteSql("drop table assets");
+        }
+
+        /// <summary>
+        /// Execute a MySqlCommand
+        /// </summary>
+        /// <param name="sql">sql string to execute</param>
+        private void ExecuteSql(string sql)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(connect))
             {
-                database.ExecuteSql("drop table migrations");
-                database.ExecuteSql("drop table assets");
+                dbcon.Open();
+
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.ExecuteNonQuery();
             }
         }
     }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index 48486b1..01afcae 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -31,6 +31,8 @@ using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
 using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
+
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -39,7 +41,6 @@ namespace OpenSim.Data.MySQL.Tests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public string file;
-        public MySQLManager database;
         public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
         
         [TestFixtureSetUp]
@@ -52,9 +53,8 @@ namespace OpenSim.Data.MySQL.Tests
             // tests.
             try 
             {
-                database = new MySQLManager(connect);
                 // clear db incase to ensure we are in a clean state
-                ClearDB(database);
+                ClearDB();
 
                 regionDb = new MySQLDataStore();
                 regionDb.Initialise(connect);
@@ -75,29 +75,41 @@ namespace OpenSim.Data.MySQL.Tests
             {
                 regionDb.Dispose();
             }
-            ClearDB(database);
+            ClearDB();
         }
 
-        private void ClearDB(MySQLManager manager)
+        private void ClearDB()
         {
             // if a new table is added, it has to be dropped here
-            if (manager != null)
+            ExecuteSql("drop table if exists migrations");
+            ExecuteSql("drop table if exists prims");
+            ExecuteSql("drop table if exists primshapes");
+            ExecuteSql("drop table if exists primitems");
+            ExecuteSql("drop table if exists terrain");
+            ExecuteSql("drop table if exists land");
+            ExecuteSql("drop table if exists landaccesslist");
+            ExecuteSql("drop table if exists regionban");
+            ExecuteSql("drop table if exists regionsettings");
+            ExecuteSql("drop table if exists estate_managers");
+            ExecuteSql("drop table if exists estate_groups");
+            ExecuteSql("drop table if exists estate_users");
+            ExecuteSql("drop table if exists estateban");
+            ExecuteSql("drop table if exists estate_settings");
+            ExecuteSql("drop table if exists estate_map");
+        }
+
+        /// <summary>
+        /// Execute a MySqlCommand
+        /// </summary>
+        /// <param name="sql">sql string to execute</param>
+        private void ExecuteSql(string sql)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(connect))
             {
-                manager.ExecuteSql("drop table if exists migrations");
-                manager.ExecuteSql("drop table if exists prims");
-                manager.ExecuteSql("drop table if exists primshapes");
-                manager.ExecuteSql("drop table if exists primitems");
-                manager.ExecuteSql("drop table if exists terrain");
-                manager.ExecuteSql("drop table if exists land");
-                manager.ExecuteSql("drop table if exists landaccesslist");
-                manager.ExecuteSql("drop table if exists regionban");
-                manager.ExecuteSql("drop table if exists regionsettings");
-                manager.ExecuteSql("drop table if exists estate_managers");
-                manager.ExecuteSql("drop table if exists estate_groups");
-                manager.ExecuteSql("drop table if exists estate_users");
-                manager.ExecuteSql("drop table if exists estateban");
-                manager.ExecuteSql("drop table if exists estate_settings");
-                manager.ExecuteSql("drop table if exists estate_map");
+                dbcon.Open();
+
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.ExecuteNonQuery();
             }
         }
     }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
deleted file mode 100644
index 8272316..0000000
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
-using MySql.Data.MySqlClient;
-
-namespace OpenSim.Data.MySQL.Tests
-{
-    [TestFixture, DatabaseTest]
-    public class MySQLGridTest : BasicGridTest
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public string file;
-        public MySQLManager database;
-        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-
-        [TestFixtureSetUp]
-        public void Init()
-        {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
-            {
-                database = new MySQLManager(connect);
-                db = new MySQLGridData();
-                db.Initialise(connect);
-            }
-            catch (Exception e)
-            {
-                m_log.Error("Exception {0}", e);
-                Assert.Ignore();
-            }
-
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
-
-            using (MySqlConnection dbcon = new MySqlConnection(connect))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, assem, "AssetStore");
-                m.Update();
-            }
-        }
-
-        [TestFixtureTearDown]
-        public void Cleanup()
-        {
-            m_log.Warn("Cleaning up.");
-            if (db != null)
-            {
-                db.Dispose();
-            }
-            // if a new table is added, it has to be dropped here
-            if (database != null)
-            {
-                database.ExecuteSql("drop table migrations");
-                database.ExecuteSql("drop table regions");
-            }
-        }
-    }
-}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index a3a32dc..4575493 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -31,6 +31,8 @@ using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
 using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
+
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -39,7 +41,6 @@ namespace OpenSim.Data.MySQL.Tests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public string file;
-        public MySQLManager database;
         public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
         
         [TestFixtureSetUp]
@@ -52,7 +53,6 @@ namespace OpenSim.Data.MySQL.Tests
             // tests.
             try 
             {
-                database = new MySQLManager(connect);
                 DropTables();
                 db = new MySQLInventoryData();
                 db.Initialise(connect);
@@ -71,17 +71,29 @@ namespace OpenSim.Data.MySQL.Tests
             {
                 db.Dispose();
             }
-            if (database != null)
-            {
-                DropTables();
-            }
+            DropTables();
         }
 
         private void DropTables()
         {
-            database.ExecuteSql("drop table IF EXISTS inventoryitems");
-            database.ExecuteSql("drop table IF EXISTS inventoryfolders");
-            database.ExecuteSql("drop table IF EXISTS migrations");
+            ExecuteSql("drop table IF EXISTS inventoryitems");
+            ExecuteSql("drop table IF EXISTS inventoryfolders");
+            ExecuteSql("drop table IF EXISTS migrations");
+        }
+
+        /// <summary>
+        /// Execute a MySqlCommand
+        /// </summary>
+        /// <param name="sql">sql string to execute</param>
+        private void ExecuteSql(string sql)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(connect))
+            {
+                dbcon.Open();
+
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.ExecuteNonQuery();
+            }
         }
     }
 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 0dc8b7d..e7e57e4 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -31,6 +31,7 @@ using OpenSim.Data.Tests;
 using log4net;
 using System.Reflection;
 using OpenSim.Tests.Common;
+using MySql.Data.MySqlClient;
 
 namespace OpenSim.Data.MySQL.Tests
 {
@@ -39,7 +40,6 @@ namespace OpenSim.Data.MySQL.Tests
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         public string file;
-        public MySQLManager database;
         public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
         
         [TestFixtureSetUp]
@@ -52,9 +52,8 @@ namespace OpenSim.Data.MySQL.Tests
             // tests.
             try 
             {
-                database = new MySQLManager(connect);
                 // this is important in case a previous run ended badly
-                ClearDB(database);
+                ClearDB();
 
                 db = new MySQLDataStore();
                 db.Initialise(connect);
@@ -73,28 +72,40 @@ namespace OpenSim.Data.MySQL.Tests
             {
                 db.Dispose();
             }
-            ClearDB(database);
+            ClearDB();
         }
 
-        private void ClearDB(MySQLManager manager) 
+        private void ClearDB() 
         {
-            if (manager != null)
+            ExecuteSql("drop table if exists migrations");
+            ExecuteSql("drop table if exists prims");
+            ExecuteSql("drop table if exists primshapes");
+            ExecuteSql("drop table if exists primitems");
+            ExecuteSql("drop table if exists terrain");
+            ExecuteSql("drop table if exists land");
+            ExecuteSql("drop table if exists landaccesslist");
+            ExecuteSql("drop table if exists regionban");
+            ExecuteSql("drop table if exists regionsettings");
+            ExecuteSql("drop table if exists estate_managers");
+            ExecuteSql("drop table if exists estate_groups");
+            ExecuteSql("drop table if exists estate_users");
+            ExecuteSql("drop table if exists estateban");
+            ExecuteSql("drop table if exists estate_settings");
+            ExecuteSql("drop table if exists estate_map");
+        }
+
+        /// <summary>
+        /// Execute a MySqlCommand
+        /// </summary>
+        /// <param name="sql">sql string to execute</param>
+        private void ExecuteSql(string sql)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(connect))
             {
-                manager.ExecuteSql("drop table if exists migrations");
-                manager.ExecuteSql("drop table if exists prims");
-                manager.ExecuteSql("drop table if exists primshapes");
-                manager.ExecuteSql("drop table if exists primitems");
-                manager.ExecuteSql("drop table if exists terrain");
-                manager.ExecuteSql("drop table if exists land");
-                manager.ExecuteSql("drop table if exists landaccesslist");
-                manager.ExecuteSql("drop table if exists regionban");
-                manager.ExecuteSql("drop table if exists regionsettings");
-                manager.ExecuteSql("drop table if exists estate_managers");
-                manager.ExecuteSql("drop table if exists estate_groups");
-                manager.ExecuteSql("drop table if exists estate_users");
-                manager.ExecuteSql("drop table if exists estateban");
-                manager.ExecuteSql("drop table if exists estate_settings");
-                manager.ExecuteSql("drop table if exists estate_map");
+                dbcon.Open();
+
+                MySqlCommand cmd = new MySqlCommand(sql, dbcon);
+                cmd.ExecuteNonQuery();
             }
         }
     }
diff --git a/OpenSim/Data/Null/NullAuthenticationData.cs b/OpenSim/Data/Null/NullAuthenticationData.cs
new file mode 100644
index 0000000..3fb3105
--- /dev/null
+++ b/OpenSim/Data/Null/NullAuthenticationData.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+
+namespace OpenSim.Data.Null
+{
+    public class NullAuthenticationData : IAuthenticationData
+    {
+        private static Dictionary<UUID, AuthenticationData> m_DataByUUID = new Dictionary<UUID, AuthenticationData>();
+        private static Dictionary<UUID, string> m_Tokens = new Dictionary<UUID, string>();
+
+        public NullAuthenticationData(string connectionString, string realm)
+        {
+        }
+
+        public AuthenticationData Get(UUID principalID)
+        {
+            if (m_DataByUUID.ContainsKey(principalID))
+                return m_DataByUUID[principalID];
+
+            return null;
+        }
+
+        public bool Store(AuthenticationData data)
+        {
+            m_DataByUUID[data.PrincipalID] = data;
+            return true;
+        }
+
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            // Not implemented
+            return false;
+        }
+
+        public bool SetToken(UUID principalID, string token, int lifetime)
+        {
+            m_Tokens[principalID] = token;
+            return true;
+        }
+
+        public bool CheckToken(UUID principalID, string token, int lifetime)
+        {
+            if (m_Tokens.ContainsKey(principalID))
+                return m_Tokens[principalID] == token;
+
+            return false;
+        }
+
+    }
+}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/Null/NullAvatarData.cs
index cf8139a..c81ba43 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/Null/NullAvatarData.cs
@@ -26,60 +26,68 @@
  */
 
 using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
-using System.Reflection;
-using OpenSim.Tests.Common;
+using System.Collections;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
 
-namespace OpenSim.Data.MySQL.Tests
+namespace OpenSim.Data.Null
 {
-    [TestFixture, DatabaseTest]
-    public class MySQLUserTest : BasicUserTest
+    public class NullAvatarData : IAvatarData
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string file;
-        public MySQLManager database;
-        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-        
-        [TestFixtureSetUp]
-        public void Init()
+        private static Dictionary<UUID, AvatarBaseData> m_DataByUUID = new Dictionary<UUID, AvatarBaseData>();
+
+        public NullAvatarData(string connectionString, string realm)
         {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try 
-            {
-                database = new MySQLManager(connect);
-                db = new MySQLUserData();
-                db.Initialise(connect);
-            } 
-            catch (Exception e)
+        }
+
+        public AvatarBaseData[] Get(string field, string val)
+        {
+            if (field == "PrincipalID")
             {
-                m_log.Error("Exception {0}", e);
-                Assert.Ignore();
+                UUID id = UUID.Zero;
+                if (UUID.TryParse(val, out id))
+                    if (m_DataByUUID.ContainsKey(id))
+                        return new AvatarBaseData[] { m_DataByUUID[id] };
             }
+
+            // Fail
+            return new AvatarBaseData[0];
         }
 
-        [TestFixtureTearDown]
-        public void Cleanup()
+        public bool Store(AvatarBaseData data)
         {
-            if (db != null)
+            m_DataByUUID[data.PrincipalID] = data;
+            return true;
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            if (m_DataByUUID.ContainsKey(principalID) && m_DataByUUID[principalID].Data.ContainsKey(name))
             {
-                db.Dispose();
+                    m_DataByUUID[principalID].Data.Remove(name);
+                    return true;
             }
-            // if a new table is added, it has to be dropped here
-            if (database != null)
+
+            return false;
+        }
+
+        public bool Delete(string field, string val)
+        {
+            if (field == "PrincipalID")
             {
-                database.ExecuteSql("drop table migrations");
-                database.ExecuteSql("drop table users");
-                database.ExecuteSql("drop table userfriends");
-                database.ExecuteSql("drop table agents");
-                database.ExecuteSql("drop table avatarappearance");
-                database.ExecuteSql("drop table avatarattachments");
+                UUID id = UUID.Zero;
+                if (UUID.TryParse(val, out id))
+                    if (m_DataByUUID.ContainsKey(id))
+                    {
+                        m_DataByUUID.Remove(id);
+                        return true;
+                    }
             }
+
+            return false;
         }
+
     }
 }
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 4b6d0f3..3ba44bb 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -50,13 +50,13 @@ namespace OpenSim.Data.Null
         public void StoreRegionSettings(RegionSettings rs)
         {
         }
-        public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             //This connector doesn't support the windlight module yet
             //Return default LL windlight settings
-            return new RegionMeta7WindlightData();
+            return new RegionLightShareData();
         }
-        public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             //This connector doesn't support the windlight module yet
         }
diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/Null/NullFriendsData.cs
index 97ca1cc..e7f7fd3 100644
--- a/OpenSim/Data/ILogData.cs
+++ b/OpenSim/Data/Null/NullFriendsData.cs
@@ -25,63 +25,68 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
-namespace OpenSim.Data
+namespace OpenSim.Data.Null
 {
-    /// <summary>
-    /// The severity of an individual log message
-    /// </summary>
-    public enum LogSeverity : int
+    public class NullFriendsData : IFriendsData
     {
-        /// <summary>
-        /// Critical: systems failure
-        /// </summary>
-        CRITICAL = 1,
-        /// <summary>
-        /// Major: warning prior to systems failure
-        /// </summary>
-        MAJOR = 2,
-        /// <summary>
-        /// Medium: an individual non-critical task failed
-        /// </summary>
-        MEDIUM = 3,
-        /// <summary>
-        /// Low: Informational warning
-        /// </summary>
-        LOW = 4,
-        /// <summary>
-        /// Info: Information
-        /// </summary>
-        INFO = 5,
-        /// <summary>
-        /// Verbose: Debug Information
-        /// </summary>
-        VERBOSE = 6
-    }
+        private static List<FriendsData> m_Data = new List<FriendsData>();
 
-    /// <summary>
-    /// An interface to a LogData storage system
-    /// </summary>
-    public interface ILogDataPlugin : IPlugin
-    {
-        void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority,
-                     string logMessage);
+        public NullFriendsData(string connectionString, string realm)
+        {
+        }
 
         /// <summary>
-        /// Initialises the interface
+        /// Tries to implement the Get [] semantics, but it cuts corners.
+        /// Specifically, it gets all friendships even if they weren't accepted yet.
         /// </summary>
-        void Initialise(string connect);
-    }
+        /// <param name="fields"></param>
+        /// <param name="values"></param>
+        /// <returns></returns>
+        public FriendsData[] GetFriends(UUID userID)
+        {
+            List<FriendsData> lst = m_Data.FindAll(delegate (FriendsData fdata)
+            {
+                return fdata.PrincipalID == userID;
+            });
 
-    public class LogDataInitialiser : PluginInitialiserBase
-    {
-        private string connect;
-        public LogDataInitialiser (string s) { connect = s; }
-        public override void Initialise (IPlugin plugin)
+            if (lst != null)
+                return lst.ToArray();
+
+            return new FriendsData[0];
+        }
+
+        public bool Store(FriendsData data)
         {
-            ILogDataPlugin p = plugin as ILogDataPlugin;
-            p.Initialise (connect);
+            if (data == null)
+                return false;
+
+            m_Data.Add(data);
+
+            return true;
         }
+
+        public bool Delete(UUID userID, string friendID)
+        {
+            List<FriendsData> lst = m_Data.FindAll(delegate(FriendsData fdata) { return fdata.PrincipalID == userID; });
+            if (lst != null)
+            {
+                FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
+                if (friendID != null)
+                {
+                    m_Data.Remove(friend);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
     }
 }
diff --git a/OpenSim/Data/Null/NullInventoryData.cs b/OpenSim/Data/Null/NullInventoryData.cs
new file mode 100644
index 0000000..8f196e2
--- /dev/null
+++ b/OpenSim/Data/Null/NullInventoryData.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data.Null
+{
+    /// <summary>
+    /// This class is completely null.
+    /// </summary>
+    public class NullInventoryData : IInventoryDataPlugin
+    {
+        public string Version { get { return "1.0.0.0"; } }
+
+        public void Initialise()
+        {
+        }
+
+        public void Dispose()
+        {
+            // Do nothing.
+        }
+
+        public string Name
+        {
+            get { return "Null Inventory Data Interface"; }
+        }
+
+        public void Initialise(string connect)
+        {
+        }
+
+
+        /// <summary>
+        /// Returns all descendent folders of this folder.  Does not return the parent folder itself.
+        /// </summary>
+        /// <param name="parentID">The folder to get subfolders for</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
+        {
+            return new List<InventoryFolderBase>();
+        }
+
+        /// <summary>
+        /// Returns a list of inventory items contained within the specified folder
+        /// </summary>
+        /// <param name="folderID">The UUID of the target folder</param>
+        /// <returns>A List of InventoryItemBase items</returns>
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
+        {
+            return new List<InventoryItemBase>();
+        }
+
+        /// <summary>
+        /// Returns a list of the root folders within a users inventory
+        /// </summary>
+        /// <param name="user">The user whos inventory is to be searched</param>
+        /// <returns>A list of folder objects</returns>
+        public List<InventoryFolderBase> getUserRootFolders(UUID user)
+        {
+            return new List<InventoryFolderBase>();
+        }
+
+        /// <summary>
+        /// Returns the users inventory root folder.
+        /// </summary>
+        /// <param name="user">The UUID of the user who is having inventory being returned</param>
+        /// <returns>Root inventory folder, null if no root inventory folder was found</returns>
+        public InventoryFolderBase getUserRootFolder(UUID user)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a list of inventory folders contained in the folder 'parentID'
+        /// </summary>
+        /// <param name="parentID">The folder to get subfolders for</param>
+        /// <returns>A list of inventory folders</returns>
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
+        {
+            return new List<InventoryFolderBase>();
+        }
+
+        /// <summary>
+        /// Returns an inventory item by its UUID
+        /// </summary>
+        /// <param name="item">The UUID of the item to be returned</param>
+        /// <returns>A class containing item information</returns>
+        public InventoryItemBase getInventoryItem(UUID item)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a specified inventory folder by its UUID
+        /// </summary>
+        /// <param name="folder">The UUID of the folder to be returned</param>
+        /// <returns>A class containing folder information</returns>
+        public InventoryFolderBase getInventoryFolder(UUID folder)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a new inventory item based on item
+        /// </summary>
+        /// <param name="item">The item to be created</param>
+        public void addInventoryItem(InventoryItemBase item)
+        {
+        }
+
+        /// <summary>
+        /// Updates an inventory item with item (updates based on ID)
+        /// </summary>
+        /// <param name="item">The updated item</param>
+        public void updateInventoryItem(InventoryItemBase item)
+        {
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="item"></param>
+        public void deleteInventoryItem(UUID item)
+        {
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="item"></param>
+        public InventoryItemBase queryInventoryItem(UUID item)
+        {
+            return null;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="item"></param>
+        public InventoryFolderBase queryInventoryFolder(UUID folder)
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a new folder specified by folder
+        /// </summary>
+        /// <param name="folder">The inventory folder</param>
+        public void addInventoryFolder(InventoryFolderBase folder)
+        {
+        }
+
+        /// <summary>
+        /// Updates a folder based on its ID with folder
+        /// </summary>
+        /// <param name="folder">The inventory folder</param>
+        public void updateInventoryFolder(InventoryFolderBase folder)
+        {
+        }
+
+        /// <summary>
+        /// Updates a folder based on its ID with folder
+        /// </summary>
+        /// <param name="folder">The inventory folder</param>
+        public void moveInventoryFolder(InventoryFolderBase folder)
+        {
+        }
+
+        /// <summary>
+        /// Deletes a folder.  Thie will delete both the folder itself and its contents (items and descendent folders)
+        /// </summary>
+        /// <param name="folder">The id of the folder</param>
+        public void deleteInventoryFolder(UUID folder)
+        {
+        }
+
+        /// <summary>
+        /// Returns all activated gesture-items in the inventory of the specified avatar.
+        /// </summary>
+        /// <param name="avatarID">
+        /// The <see cref="UUID"/> of the avatar
+        /// </param>
+        /// <returns>
+        /// The list of gestures (<see cref="InventoryItemBase"/>s)
+        /// </returns>
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
+        {
+            return new List<InventoryItemBase>();
+        }
+    }
+}
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
new file mode 100644
index 0000000..b98b5c9
--- /dev/null
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+
+namespace OpenSim.Data.Null
+{
+    public class NullPresenceData : IPresenceData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private static NullPresenceData Instance;
+
+        Dictionary<UUID, PresenceData> m_presenceData = new Dictionary<UUID, PresenceData>();
+
+        public NullPresenceData(string connectionString, string realm)
+        {
+            if (Instance == null)
+            {
+                Instance = this;
+
+                //Console.WriteLine("[XXX] NullRegionData constructor");
+            }
+        }
+
+        public bool Store(PresenceData data)
+        {
+            if (Instance != this)
+                return Instance.Store(data);
+
+//            m_log.DebugFormat("[NULL PRESENCE DATA]: Storing presence {0}", data.UserID);
+//            Console.WriteLine("HOME for " + data.UserID + " is " + (data.Data.ContainsKey("HomeRegionID") ? data.Data["HomeRegionID"] : "Not found"));
+
+            m_presenceData[data.SessionID] = data;
+            return true;
+        }
+
+        public PresenceData Get(UUID sessionID)
+        {
+            if (Instance != this)
+                return Instance.Get(sessionID);
+
+            if (m_presenceData.ContainsKey(sessionID))
+            {
+                return m_presenceData[sessionID];
+            }
+
+            return null;
+        }
+
+        public void LogoutRegionAgents(UUID regionID)
+        {
+            if (Instance != this)
+            {
+                Instance.LogoutRegionAgents(regionID);
+                return;
+            }
+
+            List<UUID> toBeDeleted = new List<UUID>();
+            foreach (KeyValuePair<UUID, PresenceData> kvp in m_presenceData)
+                if (kvp.Value.RegionID == regionID)
+                    toBeDeleted.Add(kvp.Key);
+
+            foreach (UUID u in toBeDeleted)
+                m_presenceData.Remove(u);
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt)
+        {
+            if (Instance != this)
+                return Instance.ReportAgent(sessionID, regionID, position, lookAt);
+            
+            if (m_presenceData.ContainsKey(sessionID))
+            {
+                m_presenceData[sessionID].RegionID = regionID;
+                m_presenceData[sessionID].Data["Position"] = position;
+                m_presenceData[sessionID].Data["LookAt"] = lookAt;
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            if (Instance != this)
+                return Instance.SetHomeLocation(userID, regionID, position, lookAt);
+
+            bool foundone = false;
+            foreach (PresenceData p in m_presenceData.Values)
+            {
+                if (p.UserID == userID)
+                {
+//                    m_log.DebugFormat(
+//                        "[NULL PRESENCE DATA]: Setting home location {0} {1} {2} for {3}", 
+//                        regionID, position, lookAt, p.UserID);
+
+                    p.Data["HomeRegionID"] = regionID.ToString();
+                    p.Data["HomePosition"] = position.ToString();
+                    p.Data["HomeLookAt"] = lookAt.ToString();
+                    foundone = true;
+                }
+            }
+
+            return foundone;
+        }
+
+        public PresenceData[] Get(string field, string data)
+        {
+            if (Instance != this)
+                return Instance.Get(field, data);
+
+//            m_log.DebugFormat(
+//                "[NULL PRESENCE DATA]: Getting presence data for field {0} with parameter {1}", field, data);
+
+            List<PresenceData> presences = new List<PresenceData>();
+            if (field == "UserID")
+            {
+                foreach (PresenceData p in m_presenceData.Values)
+                {
+                    if (p.UserID == data)
+                    {
+                        presences.Add(p);
+//                        Console.WriteLine("HOME for " + p.UserID + " is " + (p.Data.ContainsKey("HomeRegionID") ? p.Data["HomeRegionID"] : "Not found"));
+                    }
+                }
+                
+                return presences.ToArray();
+            }
+            else if (field == "SessionID")
+            {
+                UUID session = UUID.Zero;
+                if (!UUID.TryParse(data, out session))
+                    return presences.ToArray();
+
+                if (m_presenceData.ContainsKey(session))
+                {
+                    presences.Add(m_presenceData[session]);
+                    return presences.ToArray();
+                }
+            }
+            else if (field == "RegionID")
+            {
+                UUID region = UUID.Zero;
+                if (!UUID.TryParse(data, out region))
+                    return presences.ToArray();
+                foreach (PresenceData p in m_presenceData.Values)
+                    if (p.RegionID == region)
+                        presences.Add(p);
+                return presences.ToArray();
+            }
+            else
+            {
+                foreach (PresenceData p in m_presenceData.Values)
+                {
+                    if (p.Data.ContainsKey(field) && p.Data[field] == data)
+                        presences.Add(p);
+                }
+                return presences.ToArray();
+            }
+
+            return presences.ToArray();
+        }
+
+        public void Prune(string userID)
+        {
+            if (Instance != this)
+            {
+                Instance.Prune(userID);
+                return;
+            }
+
+//            m_log.DebugFormat("[NULL PRESENCE DATA]: Prune called for {0}", userID);
+
+            List<UUID> deleteSessions = new List<UUID>();
+            int online = 0;
+
+            foreach (KeyValuePair<UUID, PresenceData> kvp in m_presenceData)
+            {
+//                m_log.DebugFormat("Online: {0}", kvp.Value.Data["Online"]);
+                
+                bool on = false;
+                if (bool.TryParse(kvp.Value.Data["Online"], out on) && on)
+                    online++;
+                else
+                    deleteSessions.Add(kvp.Key);
+            }
+
+//            m_log.DebugFormat("[NULL PRESENCE DATA]: online [{0}], deleteSession.Count [{1}]", online, deleteSessions.Count);
+
+            // Leave one session behind so that we can pick up details such as home location
+            if (online == 0 && deleteSessions.Count > 0)
+                deleteSessions.RemoveAt(0);
+
+            foreach (UUID s in deleteSessions)
+                m_presenceData.Remove(s);
+        }
+
+        public bool Delete(string field, string data)
+        {
+//            m_log.DebugFormat(
+//                "[NULL PRESENCE DATA]: Deleting presence data for field {0} with parameter {1}", field, data);
+            
+            if (Instance != this)
+                return Instance.Delete(field, data);
+
+            List<UUID> presences = new List<UUID>();
+            if (field == "UserID")
+            {
+                foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                    if (p.Value.UserID == data)
+                        presences.Add(p.Key);
+            }
+            else if (field == "SessionID")
+            {
+                UUID session = UUID.Zero;
+                if (UUID.TryParse(data, out session))
+                {
+                    if (m_presenceData.ContainsKey(session))
+                    {
+                        presences.Add(session);
+                    }
+                }
+            }
+            else if (field == "RegionID")
+            {
+                UUID region = UUID.Zero;
+                if (UUID.TryParse(data, out region))
+                {
+                    foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                        if (p.Value.RegionID == region)
+                            presences.Add(p.Key);
+                }
+            }
+            else
+            {
+                foreach (KeyValuePair<UUID, PresenceData> p in m_presenceData)
+                {
+                    if (p.Value.Data.ContainsKey(field) && p.Value.Data[field] == data)
+                        presences.Add(p.Key);
+                }
+            }
+
+            foreach (UUID u in presences)
+                m_presenceData.Remove(u);
+
+            if (presences.Count == 0)
+                return false;
+
+            return true;
+        }
+
+    }
+}
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index e8263ea..30ad747 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -31,20 +31,31 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Data.Null
 {
     public class NullRegionData : IRegionData
     {
+        private static NullRegionData Instance = null;
+
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         Dictionary<UUID, RegionData> m_regionData = new Dictionary<UUID, RegionData>();
 
         public NullRegionData(string connectionString, string realm)
         {
+            if (Instance == null)
+                Instance = this;
             //Console.WriteLine("[XXX] NullRegionData constructor");
         }
 
         public List<RegionData> Get(string regionName, UUID scopeID)
         {
+            if (Instance != this)
+                return Instance.Get(regionName, scopeID);
+
             List<RegionData> ret = new List<RegionData>();
 
             foreach (RegionData r in m_regionData.Values)
@@ -69,6 +80,9 @@ namespace OpenSim.Data.Null
 
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
+            if (Instance != this)
+                return Instance.Get(posX, posY, scopeID);
+
             List<RegionData> ret = new List<RegionData>();
 
             foreach (RegionData r in m_regionData.Values)
@@ -85,6 +99,9 @@ namespace OpenSim.Data.Null
 
         public RegionData Get(UUID regionID, UUID scopeID)
         {
+            if (Instance != this)
+                return Instance.Get(regionID, scopeID);
+
             if (m_regionData.ContainsKey(regionID))
                 return m_regionData[regionID];
 
@@ -93,6 +110,9 @@ namespace OpenSim.Data.Null
 
         public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
+            if (Instance != this)
+                return Instance.Get(startX, startY, endX, endY, scopeID);
+
             List<RegionData> ret = new List<RegionData>();
 
             foreach (RegionData r in m_regionData.Values)
@@ -106,6 +126,9 @@ namespace OpenSim.Data.Null
 
         public bool Store(RegionData data)
         {
+            if (Instance != this)
+                return Instance.Store(data);
+
             m_regionData[data.RegionID] = data;
 
             return true;
@@ -113,6 +136,9 @@ namespace OpenSim.Data.Null
 
         public bool SetDataItem(UUID regionID, string item, string value)
         {
+            if (Instance != this)
+                return Instance.SetDataItem(regionID, item, value);
+
             if (!m_regionData.ContainsKey(regionID))
                 return false;
 
@@ -123,6 +149,9 @@ namespace OpenSim.Data.Null
 
         public bool Delete(UUID regionID)
         {
+            if (Instance != this)
+                return Instance.Delete(regionID);
+
             if (!m_regionData.ContainsKey(regionID))
                 return false;
 
@@ -130,5 +159,37 @@ namespace OpenSim.Data.Null
 
             return true;
         }
+
+        public List<RegionData> GetDefaultRegions(UUID scopeID)
+        {
+            if (Instance != this)
+                return Instance.GetDefaultRegions(scopeID);
+
+            List<RegionData> ret = new List<RegionData>();
+
+            foreach (RegionData r in m_regionData.Values)
+            {
+                if ((Convert.ToInt32(r.Data["flags"]) & 1) != 0)
+                    ret.Add(r);
+            }
+
+            return ret;
+        }
+
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            if (Instance != this)
+                return Instance.GetFallbackRegions(scopeID, x, y);
+
+            List<RegionData> ret = new List<RegionData>();
+
+            foreach (RegionData r in m_regionData.Values)
+            {
+                if ((Convert.ToInt32(r.Data["flags"]) & 2) != 0)
+                    ret.Add(r);
+            }
+
+            return ret;
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
new file mode 100644
index 0000000..9eb94e6
--- /dev/null
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Data;
+
+namespace OpenSim.Data.Null
+{
+    public class NullUserAccountData : IUserAccountData
+    {
+        private static Dictionary<UUID, UserAccountData> m_DataByUUID = new Dictionary<UUID, UserAccountData>();
+        private static Dictionary<string, UserAccountData> m_DataByName = new Dictionary<string, UserAccountData>();
+        private static Dictionary<string, UserAccountData> m_DataByEmail = new Dictionary<string, UserAccountData>();
+
+        public NullUserAccountData(string connectionString, string realm)
+        {
+        }
+
+        /// <summary>
+        /// Tries to implement the Get [] semantics, but it cuts corners like crazy.
+        /// Specifically, it relies on the knowledge that the only Gets used are
+        /// keyed on PrincipalID, Email, and FirstName+LastName.
+        /// </summary>
+        /// <param name="fields"></param>
+        /// <param name="values"></param>
+        /// <returns></returns>
+        public UserAccountData[] Get(string[] fields, string[] values)
+        {
+            List<string> fieldsLst = new List<string>(fields);
+            if (fieldsLst.Contains("PrincipalID"))
+            {
+                int i = fieldsLst.IndexOf("PrincipalID");
+                UUID id = UUID.Zero;
+                if (UUID.TryParse(values[i], out id))
+                    if (m_DataByUUID.ContainsKey(id))
+                        return new UserAccountData[] { m_DataByUUID[id] };
+            }
+            if (fieldsLst.Contains("FirstName") && fieldsLst.Contains("LastName"))
+            {
+                int findex = fieldsLst.IndexOf("FirstName");
+                int lindex = fieldsLst.IndexOf("LastName");
+                if (m_DataByName.ContainsKey(values[findex] + " " + values[lindex]))
+                    return new UserAccountData[] { m_DataByName[values[findex] + " " + values[lindex]] };
+            }
+            if (fieldsLst.Contains("Email"))
+            {
+                int i = fieldsLst.IndexOf("Email");
+                if (m_DataByEmail.ContainsKey(values[i]))
+                    return new UserAccountData[] { m_DataByEmail[values[i]] };
+            }
+
+            // Fail
+            return new UserAccountData[0];
+        }
+
+        public bool Store(UserAccountData data)
+        {
+            if (data == null)
+                return false;
+
+            m_DataByUUID[data.PrincipalID] = data;
+            m_DataByName[data.FirstName + " " + data.LastName] = data;
+            if (data.Data.ContainsKey("Email") && data.Data["Email"] != string.Empty)
+                m_DataByEmail[data.Data["Email"]] = data;
+
+            return true;
+        }
+
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
+        {
+            string[] words = query.Split(new char[] { ' ' });
+
+            for (int i = 0; i < words.Length; i++)
+            {
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
+            }
+
+            if (words.Length == 0)
+                return new UserAccountData[0];
+
+            if (words.Length > 2)
+                return new UserAccountData[0];
+
+            List<string> lst = new List<string>(m_DataByName.Keys);
+            if (words.Length == 1)
+            {
+                lst = lst.FindAll(delegate(string s) { return s.StartsWith(words[0]); });
+            }
+            else
+            {
+                lst = lst.FindAll(delegate(string s) { return s.Contains(words[0]) || s.Contains(words[1]); });
+            }
+
+            if (lst == null || (lst != null && lst.Count == 0))
+                return new UserAccountData[0];
+
+            UserAccountData[] result = new UserAccountData[lst.Count];
+            int n = 0;
+            foreach (string key in lst)
+                result[n++] = m_DataByName[key];
+
+            return result;
+        }
+
+        public bool Delete(string field, string val)
+        {
+            // Only delete by PrincipalID
+            if (field.Equals("PrincipalID"))
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(val, out uuid) && m_DataByUUID.ContainsKey(uuid))
+                {
+                    UserAccountData account = m_DataByUUID[uuid];
+                    m_DataByUUID.Remove(uuid);
+                    if (m_DataByName.ContainsKey(account.FirstName + " " + account.LastName))
+                        m_DataByName.Remove(account.FirstName + " " + account.LastName);
+                    if (account.Data.ContainsKey("Email") && account.Data["Email"] != string.Empty && m_DataByEmail.ContainsKey(account.Data["Email"]))
+                        m_DataByEmail.Remove(account.Data["Email"]);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
deleted file mode 100644
index 86d7f6b..0000000
--- a/OpenSim/Data/RegionProfileData.cs
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    /// <summary>
-    /// A class which contains information known to the grid server about a region
-    /// </summary>
-    [Serializable]
-    public class RegionProfileData
-    {
-        /// <summary>
-        /// The name of the region
-        /// </summary>
-        public string regionName = String.Empty;
-
-        /// <summary>
-        /// A 64-bit number combining map position into a (mostly) unique ID
-        /// </summary>
-        public ulong regionHandle;
-
-        /// <summary>
-        /// OGS/OpenSim Specific ID for a region
-        /// </summary>
-        public UUID UUID;
-
-        /// <summary>
-        /// Coordinates of the region
-        /// </summary>
-        public uint regionLocX;
-        public uint regionLocY;
-        public uint regionLocZ; // Reserved (round-robin, layers, etc)
-
-        /// <summary>
-        /// Authentication secrets
-        /// </summary>
-        /// <remarks>Not very secure, needs improvement.</remarks>
-        public string regionSendKey = String.Empty;
-        public string regionRecvKey = String.Empty;
-        public string regionSecret = String.Empty;
-
-        /// <summary>
-        /// Whether the region is online
-        /// </summary>
-        public bool regionOnline;
-
-        /// <summary>
-        /// Information about the server that the region is currently hosted on
-        /// </summary>
-        public string serverIP = String.Empty;
-        public uint serverPort;
-        public string serverURI = String.Empty;
-
-        public uint httpPort;
-        public uint remotingPort;
-        public string httpServerURI = String.Empty;
-
-        /// <summary>
-        /// Set of optional overrides. Can be used to create non-eulicidean spaces.
-        /// </summary>
-        public ulong regionNorthOverrideHandle;
-        public ulong regionSouthOverrideHandle;
-        public ulong regionEastOverrideHandle;
-        public ulong regionWestOverrideHandle;
-
-        /// <summary>
-        /// Optional: URI Location of the region database
-        /// </summary>
-        /// <remarks>Used for floating sim pools where the region data is not nessecarily coupled to a specific server</remarks>
-        public string regionDataURI = String.Empty;
-
-        /// <summary>
-        /// Region Asset Details
-        /// </summary>
-        public string regionAssetURI = String.Empty;
-
-        public string regionAssetSendKey = String.Empty;
-        public string regionAssetRecvKey = String.Empty;
-
-        /// <summary>
-        /// Region Userserver Details
-        /// </summary>
-        public string regionUserURI = String.Empty;
-
-        public string regionUserSendKey = String.Empty;
-        public string regionUserRecvKey = String.Empty;
-
-        /// <summary>
-        /// Region Map Texture Asset
-        /// </summary>
-        public UUID regionMapTextureID = new UUID("00000000-0000-1111-9999-000000000006");
-
-        /// <summary>
-        /// this particular mod to the file provides support within the spec for RegionProfileData for the
-        /// owner_uuid for the region
-        /// </summary>
-        public UUID owner_uuid = UUID.Zero;
-
-        /// <summary>
-        /// OGS/OpenSim Specific original ID for a region after move/split
-        /// </summary>
-        public UUID originUUID;
-
-        /// <summary>
-        /// The Maturity rating of the region
-        /// </summary>
-        public uint maturity;
-
-
-        //Data Wrappers
-        public string RegionName
-        {
-            get { return regionName; }
-            set { regionName = value; }
-        }
-        public ulong RegionHandle
-        {
-            get { return regionHandle; }
-            set { regionHandle = value; }
-        }
-        public UUID Uuid
-        {
-            get { return UUID; }
-            set { UUID = value; }
-        }
-        public uint RegionLocX
-        {
-            get { return regionLocX; }
-            set { regionLocX = value; }
-        }
-        public uint RegionLocY
-        {
-            get { return regionLocY; }
-            set { regionLocY = value; }
-        }
-        public uint RegionLocZ
-        {
-            get { return regionLocZ; }
-            set { regionLocZ = value; }
-        }
-        public string RegionSendKey
-        {
-            get { return regionSendKey; }
-            set { regionSendKey = value; }
-        }
-        public string RegionRecvKey
-        {
-            get { return regionRecvKey; }
-            set { regionRecvKey = value; }
-        }
-        public string RegionSecret
-        {
-            get { return regionSecret; }
-            set { regionSecret = value; }
-        }
-        public bool RegionOnline
-        {
-            get { return regionOnline; }
-            set { regionOnline = value; }
-        }
-        public string ServerIP
-        {
-            get { return serverIP; }
-            set { serverIP = value; }
-        }
-        public uint ServerPort
-        {
-            get { return serverPort; }
-            set { serverPort = value; }
-        }
-        public string ServerURI
-        {
-            get { return serverURI; }
-            set { serverURI = value; }
-        }
-        public uint ServerHttpPort
-        {
-            get { return httpPort; }
-            set { httpPort = value; }
-        }
-        public uint ServerRemotingPort
-        {
-            get { return remotingPort; }
-            set { remotingPort = value; }
-        }
-
-        public ulong NorthOverrideHandle
-        {
-            get { return regionNorthOverrideHandle; }
-            set { regionNorthOverrideHandle = value; }
-        }
-        public ulong SouthOverrideHandle
-        {
-            get { return regionSouthOverrideHandle; }
-            set { regionSouthOverrideHandle = value; }
-        }
-        public ulong EastOverrideHandle
-        {
-            get { return regionEastOverrideHandle; }
-            set { regionEastOverrideHandle = value; }
-        }
-        public ulong WestOverrideHandle
-        {
-            get { return regionWestOverrideHandle; }
-            set { regionWestOverrideHandle = value; }
-        }
-        public string RegionDataURI
-        {
-            get { return regionDataURI; }
-            set { regionDataURI = value; }
-        }
-        public string RegionAssetURI
-        {
-            get { return regionAssetURI; }
-            set { regionAssetURI = value; }
-        }
-        public string RegionAssetSendKey
-        {
-            get { return regionAssetSendKey; }
-            set { regionAssetSendKey = value; }
-        }
-        public string RegionAssetRecvKey
-        {
-            get { return regionAssetRecvKey; }
-            set { regionAssetRecvKey = value; }
-        }
-        public string RegionUserURI
-        {
-            get { return regionUserURI; }
-            set { regionUserURI = value; }
-        }
-        public string RegionUserSendKey
-        {
-            get { return regionUserSendKey; }
-            set { regionUserSendKey = value; }
-        }
-        public string RegionUserRecvKey
-        {
-            get { return regionUserRecvKey; }
-            set { regionUserRecvKey = value; }
-        }
-        public UUID RegionMapTextureID
-        {
-            get { return regionMapTextureID; }
-            set { regionMapTextureID = value; }
-        }
-        public UUID Owner_uuid
-        {
-            get { return owner_uuid; }
-            set { owner_uuid = value; }
-        }
-        public UUID OriginUUID
-        {
-            get { return originUUID; }
-            set { originUUID = value; }
-        }
-        public uint Maturity
-        {
-            get { return maturity; }
-            set { maturity = value; }
-        }
-
-        public byte AccessLevel
-        {
-            get { return Util.ConvertMaturityToAccessLevel(maturity); }
-        }
-
-
-        public RegionInfo ToRegionInfo()
-        {
-            return RegionInfo.Create(UUID, regionName, regionLocX, regionLocY, serverIP, httpPort, serverPort, remotingPort, serverURI);
-        }
-
-        public static RegionProfileData FromRegionInfo(RegionInfo regionInfo)
-        {
-            if (regionInfo == null)
-            {
-                return null;
-            }
-
-            return Create(regionInfo.RegionID, regionInfo.RegionName, regionInfo.RegionLocX,
-                          regionInfo.RegionLocY, regionInfo.ExternalHostName,
-                          (uint) regionInfo.ExternalEndPoint.Port, regionInfo.HttpPort, regionInfo.RemotingPort,
-                          regionInfo.ServerURI, regionInfo.AccessLevel);
-        }
-
-        public static RegionProfileData Create(UUID regionID, string regionName, uint locX, uint locY, string externalHostName, uint regionPort, uint httpPort, uint remotingPort, string serverUri, byte access)
-        {
-            RegionProfileData regionProfile;
-            regionProfile = new RegionProfileData();
-            regionProfile.regionLocX = locX;
-            regionProfile.regionLocY = locY;
-            regionProfile.regionHandle =
-                Utils.UIntsToLong((regionProfile.regionLocX * Constants.RegionSize),
-                                  (regionProfile.regionLocY*Constants.RegionSize));
-            regionProfile.serverIP = externalHostName;
-            regionProfile.serverPort = regionPort;
-            regionProfile.httpPort = httpPort;
-            regionProfile.remotingPort = remotingPort;
-            regionProfile.serverURI = serverUri;
-            regionProfile.httpServerURI = "http://" + externalHostName + ":" + httpPort + "/";
-            regionProfile.UUID = regionID;
-            regionProfile.regionName = regionName;
-            regionProfile.maturity = access;
-            return regionProfile;
-        }
-    }
-}
diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs
deleted file mode 100644
index 20d7df0..0000000
--- a/OpenSim/Data/RegionProfileServiceProxy.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    public class RegionProfileServiceProxy : IRegionProfileRouter
-    {
-        /// <summary>
-        /// Request sim data based on arbitrary key/value
-        /// </summary>
-        private RegionProfileData RequestSimData(Uri gridserverUrl, string gridserverSendkey, string keyField, string keyValue)
-        {
-            Hashtable requestData = new Hashtable();
-            requestData[keyField] = keyValue;
-            requestData["authkey"] = gridserverSendkey;
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(requestData);
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(gridserverUrl.ToString(), 3000);
-
-            Hashtable responseData = (Hashtable) GridResp.Value;
-
-            RegionProfileData simData = null;
-
-            if (!responseData.ContainsKey("error"))
-            {
-                uint locX = Convert.ToUInt32((string)responseData["region_locx"]);
-                uint locY = Convert.ToUInt32((string)responseData["region_locy"]);
-                string externalHostName = (string)responseData["sim_ip"];
-                uint simPort = Convert.ToUInt32((string)responseData["sim_port"]);
-                uint httpPort = Convert.ToUInt32((string)responseData["http_port"]);
-                uint remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-                string serverUri = (string)responseData["server_uri"];
-                UUID regionID = new UUID((string)responseData["region_UUID"]);
-                string regionName = (string)responseData["region_name"];
-                byte access = Convert.ToByte((string)responseData["access"]);
-
-                simData = RegionProfileData.Create(regionID, regionName, locX, locY, externalHostName, simPort, httpPort, remotingPort, serverUri, access);
-            }
-
-            return simData;
-        }
-
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region UUID
-        /// </summary>
-        /// <param name="regionId">The region UUID to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        /// <remarks>This method should be statics</remarks>
-        public RegionProfileData RequestSimProfileData(UUID regionId, Uri gridserverUrl,
-                                                              string gridserverSendkey, string gridserverRecvkey)
-        {
-            return RequestSimData(gridserverUrl, gridserverSendkey, "region_UUID", regionId.Guid.ToString());
-        }
-
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region Handle
-        /// </summary>
-        /// <param name="regionHandle">the region handle to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        public RegionProfileData RequestSimProfileData(ulong regionHandle, Uri gridserverUrl,
-                                                              string gridserverSendkey, string gridserverRecvkey)
-        {
-            return RequestSimData(gridserverUrl, gridserverSendkey, "region_handle", regionHandle.ToString());
-        }
-
-        /// <summary>
-        /// Request sim profile information from a grid server, by Region Name
-        /// </summary>
-        /// <param name="regionName">the region name to look for</param>
-        /// <param name="gridserverUrl"></param>
-        /// <param name="gridserverSendkey"></param>
-        /// <param name="gridserverRecvkey"></param>
-        /// <returns>The sim profile.  Null if there was a request failure</returns>
-        public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl,
-                                                              string gridserverSendkey, string gridserverRecvkey)
-        {
-            return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName);
-        }
-    }
-}
diff --git a/OpenSim/Data/SQLite/Resources/001_AuthStore.sql b/OpenSim/Data/SQLite/Resources/001_AuthStore.sql
new file mode 100644
index 0000000..468567d
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_AuthStore.sql
@@ -0,0 +1,18 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE auth (
+  UUID char(36) NOT NULL,
+  passwordHash char(32) NOT NULL default '',
+  passwordSalt char(32) NOT NULL default '',
+  webLoginKey varchar(255) NOT NULL default '',
+  accountType VARCHAR(32) NOT NULL DEFAULT 'UserAccount',
+  PRIMARY KEY  (`UUID`)
+);
+
+CREATE TABLE tokens (
+  UUID char(36) NOT NULL,
+  token varchar(255) NOT NULL,
+  validity datetime NOT NULL
+);
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/001_Avatar.sql b/OpenSim/Data/SQLite/Resources/001_Avatar.sql
new file mode 100644
index 0000000..7ec906b
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_Avatar.sql
@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE Avatars (
+        PrincipalID CHAR(36) NOT NULL, 
+        Name VARCHAR(32) NOT NULL, 
+        Value VARCHAR(255) NOT NULL DEFAULT '', 
+        PRIMARY KEY(PrincipalID, Name));
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/001_FriendsStore.sql b/OpenSim/Data/SQLite/Resources/001_FriendsStore.sql
new file mode 100644
index 0000000..f1b9ab9
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_FriendsStore.sql
@@ -0,0 +1,10 @@
+BEGIN TRANSACTION;
+
+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`));
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/001_UserAccount.sql b/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
new file mode 100644
index 0000000..c38d9a7
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_UserAccount.sql
@@ -0,0 +1,17 @@
+BEGIN TRANSACTION;
+
+-- useraccounts table
+CREATE TABLE UserAccounts (
+    PrincipalID CHAR(36)  primary key,
+    ScopeID CHAR(36) NOT NULL,
+    FirstName VARCHAR(64) NOT NULL,
+    LastName VARCHAR(64) NOT NULL,
+    Email VARCHAR(64),
+    ServiceURLs TEXT,
+    Created INT(11),
+    UserLevel integer NOT NULL DEFAULT 0,
+    UserFlags integer NOT NULL DEFAULT 0,
+    UserTitle varchar(64) NOT NULL DEFAULT ''
+);
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Resources/002_AuthStore.sql b/OpenSim/Data/SQLite/Resources/002_AuthStore.sql
new file mode 100644
index 0000000..3237b68
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/002_AuthStore.sql
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..6733502
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/002_FriendsStore.sql
@@ -0,0 +1,5 @@
+BEGIN TRANSACTION;
+
+INSERT INTO `Friends` SELECT `ownerID`, `friendID`, `friendPerms`, 0 FROM `userfriends`;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/002_UserAccount.sql b/OpenSim/Data/SQLite/Resources/002_UserAccount.sql
new file mode 100644
index 0000000..c7a6293
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/002_UserAccount.sql
@@ -0,0 +1,5 @@
+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/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c52f60b..a032670 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -137,7 +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(":Data", asset.Data));
-
+ 
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -234,7 +234,8 @@ namespace OpenSim.Data.SQLite
             AssetBase asset = new AssetBase(
                 new UUID((String)row["UUID"]),
                 (String)row["Name"],
-                Convert.ToSByte(row["Type"])
+                Convert.ToSByte(row["Type"]),
+                UUID.Zero.ToString()
             );
 
             asset.Description = (String) row["Description"];
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
new file mode 100644
index 0000000..aa10734
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
+    {
+        private string m_Realm;
+        private List<string> m_ColumnNames;
+        private int m_LastExpire;
+        private string m_connectionString;
+
+        protected static SqliteConnection m_Connection;
+        private static bool m_initialized = false;
+
+        public SQLiteAuthenticationData(string connectionString, string realm)
+                : base(connectionString)
+        {
+            m_Realm = realm;
+            m_connectionString = connectionString;
+
+            if (!m_initialized)
+            {
+                m_Connection = new SqliteConnection(connectionString);
+                m_Connection.Open();
+
+                using (SqliteConnection dbcon = (SqliteConnection)((ICloneable)m_Connection).Clone())
+                {
+                    dbcon.Open();
+                    Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore");
+                    m.Update();
+                    dbcon.Close();
+                }
+
+                m_initialized = true;
+            }
+        }
+
+        public AuthenticationData Get(UUID principalID)
+        {
+            AuthenticationData ret = new AuthenticationData();
+            ret.Data = new Dictionary<string, object>();
+
+            SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID");
+            cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
+
+            IDataReader result = ExecuteReader(cmd, m_Connection);
+
+            try
+            {
+                if (result.Read())
+                {
+                    ret.PrincipalID = principalID;
+
+                    if (m_ColumnNames == null)
+                    {
+                        m_ColumnNames = new List<string>();
+
+                        DataTable schemaTable = result.GetSchemaTable();
+                        foreach (DataRow row in schemaTable.Rows)
+                            m_ColumnNames.Add(row["ColumnName"].ToString());
+                    }
+
+                    foreach (string s in m_ColumnNames)
+                    {
+                        if (s == "UUID")
+                            continue;
+
+                        ret.Data[s] = result[s].ToString();
+                    }
+
+                    return ret;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            catch
+            {
+            }
+            finally
+            {
+                CloseCommand(cmd);
+            }
+
+            return null;
+        }
+
+        public bool Store(AuthenticationData data)
+        {
+            if (data.Data.ContainsKey("UUID"))
+                data.Data.Remove("UUID");
+
+            string[] fields = new List<string>(data.Data.Keys).ToArray();
+            string[] values = new string[data.Data.Count];
+            int i = 0;
+            foreach (object o in data.Data.Values)
+                values[i++] = o.ToString();
+
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (Get(data.PrincipalID) != null)
+            {
+
+
+                string update = "update `" + m_Realm + "` set ";
+                bool first = true;
+                foreach (string field in fields)
+                {
+                    if (!first)
+                        update += ", ";
+                    update += "`" + field + "` = :" + field;
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
+
+                    first = false;
+                }
+
+                update += " where UUID = :UUID";
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+
+                cmd.CommandText = update;
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
+                    {
+                        CloseCommand(cmd);
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    CloseCommand(cmd);
+                    return false;
+                }
+            }
+
+            else
+            {
+                string insert = "insert into `" + m_Realm + "` (`UUID`, `" +
+                        String.Join("`, `", fields) +
+                        "`) values (:UUID, :" + String.Join(", :", fields) + ")";
+
+                cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
+                foreach (string field in fields)
+                    cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
+
+                cmd.CommandText = insert;
+
+                try
+                {
+                    if (ExecuteNonQuery(cmd, m_Connection) < 1)
+                    {
+                        CloseCommand(cmd);
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    CloseCommand(cmd);
+                    return false;
+                }
+            }
+
+            CloseCommand(cmd);
+
+            return true;
+        }
+
+        public bool SetDataItem(UUID principalID, string item, string value)
+        {
+            SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
+                    "` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                return true;
+
+            return false;
+        }
+
+        public bool SetToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() + 
+                "', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+            {
+                cmd.Dispose();
+                return true;
+            }
+
+            cmd.Dispose();
+            return false;
+        }
+
+        public bool CheckToken(UUID principalID, string token, int lifetime)
+        {
+            if (System.Environment.TickCount - m_LastExpire > 30000)
+                DoExpire();
+
+            SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + 
+                " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')");
+
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
+            {
+                cmd.Dispose();
+                return true;
+            }
+
+            cmd.Dispose();
+
+            return false;
+        }
+
+        private void DoExpire()
+        {
+            SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')");
+            ExecuteNonQuery(cmd, m_Connection);
+
+            cmd.Dispose();
+
+            m_LastExpire = System.Environment.TickCount;
+        }
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteAvatarData.cs b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
new file mode 100644
index 0000000..b3f4a4c
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteAvatarData.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
+
+namespace OpenSim.Data.SQLite
+{
+    /// <summary>
+    /// A SQLite Interface for Avatar Data
+    /// </summary>
+    public class SQLiteAvatarData : SQLiteGenericTableHandler<AvatarBaseData>,
+            IAvatarData
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public SQLiteAvatarData(string connectionString, string realm) :
+                base(connectionString, realm, "Avatar")
+        {
+        }
+
+        public bool Delete(UUID principalID, string name)
+        {
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
+            cmd.Parameters.Add(":PrincipalID", principalID.ToString());
+            cmd.Parameters.Add(":Name", name);
+
+            try
+            {
+                if (ExecuteNonQuery(cmd, m_Connection) > 0)
+                    return true;
+
+                return false;
+            }
+            finally
+            {
+                CloseCommand(cmd);
+            }
+        }
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 1be99ee..bd6b776 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -80,11 +80,8 @@ namespace OpenSim.Data.SQLite
             get { return new List<string>(m_FieldMap.Keys).ToArray(); }
         }
 
-        public EstateSettings LoadEstateSettings(UUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
-            EstateSettings es = new EstateSettings();
-            es.OnSave += StoreEstateSettings;
-
             string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = :RegionID";
 
             SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
@@ -92,6 +89,14 @@ namespace OpenSim.Data.SQLite
             cmd.CommandText = sql;
             cmd.Parameters.Add(":RegionID", regionID.ToString());
 
+            return DoLoad(cmd, regionID, create);
+        }
+
+        private EstateSettings DoLoad(SqliteCommand cmd, UUID regionID, bool create)
+        {
+            EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
+
             IDataReader r = cmd.ExecuteReader();
 
             if (r.Read())
@@ -120,17 +125,15 @@ namespace OpenSim.Data.SQLite
                 }
                 r.Close();
             }
-            else
+            else if (create)
             {
-                // Migration case
-                //
                 r.Close();
 
                 List<string> names = new List<string>(FieldList);
 
                 names.Remove("EstateID");
 
-                sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
+                string sql = "insert into estate_settings ("+String.Join(",", names.ToArray())+") values ( :"+String.Join(", :", names.ToArray())+")";
 
                 cmd.CommandText = sql;
                 cmd.Parameters.Clear();
@@ -176,20 +179,6 @@ namespace OpenSim.Data.SQLite
                 {
                 }
 
-                // Munge and transfer the ban list
-                //
-                cmd.Parameters.Clear();
-                cmd.CommandText = "insert into estateban select "+es.EstateID.ToString()+", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = :UUID";
-                cmd.Parameters.Add(":UUID", regionID.ToString());
-
-                try
-                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (Exception)
-                {
-                }
-
                 es.Save();
             }
 
@@ -336,5 +325,63 @@ namespace OpenSim.Data.SQLite
 
             return uuids.ToArray();
         }
+
+        public EstateSettings LoadEstateSettings(int estateID)
+        {
+            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID";
+
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = sql;
+            cmd.Parameters.Add(":EstateID", estateID.ToString());
+
+            return DoLoad(cmd, UUID.Zero, false);
+        }
+
+        public List<int> GetEstates(string search)
+        {
+            List<int> result = new List<int>();
+
+            string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName";
+
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = sql;
+            cmd.Parameters.Add(":EstateName", search);
+
+            IDataReader r = cmd.ExecuteReader();
+
+            while (r.Read())
+            {
+                result.Add(Convert.ToInt32(r["EstateID"]));
+            }
+            r.Close();
+
+            return result;
+        }
+
+        public bool LinkRegion(UUID regionID, int estateID)
+        {
+            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
+
+            cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
+            cmd.Parameters.Add(":RegionID", regionID.ToString());
+            cmd.Parameters.Add(":EstateID", estateID.ToString());
+
+            if (cmd.ExecuteNonQuery() == 0)
+                return false;
+
+            return true;
+        }
+
+        public List<UUID> GetRegions(int estateID)
+        {
+            return new List<UUID>();
+        }
+
+        public bool DeleteEstate(int estateID)
+        {
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..20b5085 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -40,12 +40,10 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteFramework
     {
-        protected SqliteConnection m_Connection;
+        protected Object m_lockObject = new Object();
 
         protected SQLiteFramework(string connectionString)
         {
-            m_Connection = new SqliteConnection(connectionString);
-            m_Connection.Open();
         }
 
         //////////////////////////////////////////////////////////////
@@ -53,27 +51,37 @@ namespace OpenSim.Data.SQLite
         // All non queries are funneled through one connection
         // to increase performance a little
         //
-        protected int ExecuteNonQuery(SqliteCommand cmd)
+        protected int ExecuteNonQuery(SqliteCommand cmd, SqliteConnection connection)
         {
-            lock (m_Connection)
+            lock (connection)
             {
-                cmd.Connection = m_Connection;
+                SqliteConnection newConnection =
+                        (SqliteConnection)((ICloneable)connection).Clone();
+                newConnection.Open();
+
+                cmd.Connection = newConnection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
 
                 return cmd.ExecuteNonQuery();
             }
         }
-        
-        protected IDataReader ExecuteReader(SqliteCommand cmd)
+
+        protected IDataReader ExecuteReader(SqliteCommand cmd, SqliteConnection connection)
         {
-            SqliteConnection newConnection =
-                    (SqliteConnection)((ICloneable)m_Connection).Clone();
-            newConnection.Open();
+            lock (connection)
+            {
+                SqliteConnection newConnection =
+                        (SqliteConnection)((ICloneable)connection).Clone();
+                newConnection.Open();
 
-            cmd.Connection = newConnection;
-            return cmd.ExecuteReader();
+                cmd.Connection = newConnection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+
+                return cmd.ExecuteReader();
+            }
         }
 
-        protected void CloseReaderCommand(SqliteCommand cmd)
+        protected void CloseCommand(SqliteCommand cmd)
         {
             cmd.Connection.Close();
             cmd.Connection.Dispose();
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
new file mode 100644
index 0000000..0b12182
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData
+    {
+        public SQLiteFriendsData(string connectionString, string realm)
+            : base(connectionString, realm, "FriendsStore")
+        {
+        }
+
+        public FriendsData[] GetFriends(UUID userID)
+        {
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
+            cmd.Parameters.Add(":PrincipalID", userID.ToString());
+
+            return DoQuery(cmd);
+
+        }
+
+        public bool Delete(UUID principalID, string friend)
+        {
+            SqliteCommand cmd = new SqliteCommand();
+
+            cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
+            cmd.Parameters.Add(":PrincipalID", principalID.ToString());
+            cmd.Parameters.Add(":Friend", friend);
+
+            ExecuteNonQuery(cmd, cmd.Connection);
+
+            return true;
+        }
+
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 8e91693..b39bb19 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -48,16 +48,33 @@ namespace OpenSim.Data.SQLite
         protected string m_Realm;
         protected FieldInfo m_DataField = null;
 
+        protected static SqliteConnection m_Connection;
+        private static bool m_initialized;
+
         public SQLiteGenericTableHandler(string connectionString,
                 string realm, string storeName) : base(connectionString)
         {
             m_Realm = realm;
-            if (storeName != String.Empty)
+
+            if (!m_initialized)
             {
-                Assembly assem = GetType().Assembly;
+                m_Connection = new SqliteConnection(connectionString);
+                m_Connection.Open();
+
+                if (storeName != String.Empty)
+                {
+                    Assembly assem = GetType().Assembly;
+                    SqliteConnection newConnection =
+                            (SqliteConnection)((ICloneable)m_Connection).Clone();
+                    newConnection.Open();
+
+                    Migration m = new Migration(newConnection, assem, storeName);
+                    m.Update();
+                    newConnection.Close();
+                    newConnection.Dispose();
+                }
 
-                Migration m = new Migration(m_Connection, assem, storeName);
-                m.Update();
+                m_initialized = true;
             }
 
             Type t = typeof(T);
@@ -125,7 +142,7 @@ namespace OpenSim.Data.SQLite
 
         protected T[] DoQuery(SqliteCommand cmd)
         {
-            IDataReader reader = ExecuteReader(cmd);
+            IDataReader reader = ExecuteReader(cmd, m_Connection);
             if (reader == null)
                 return new T[0];
 
@@ -180,7 +197,7 @@ namespace OpenSim.Data.SQLite
                 result.Add(row);
             }
 
-            CloseReaderCommand(cmd);
+            CloseCommand(cmd);
 
             return result.ToArray();
         }
@@ -229,7 +246,7 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = query;
 
-            if (ExecuteNonQuery(cmd) > 0)
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
                 return true;
 
             return false;
@@ -242,7 +259,7 @@ namespace OpenSim.Data.SQLite
             cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
             cmd.Parameters.Add(new SqliteParameter(field, val));
 
-            if (ExecuteNonQuery(cmd) > 0)
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
                 return true;
 
             return false;
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
deleted file mode 100644
index 18abb88..0000000
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.SQLite
-{
-    /// <summary>
-    /// A Grid Interface to the SQLite database
-    /// </summary>
-    public class SQLiteGridData : GridDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// SQLite database manager
-        /// </summary>
-        private SQLiteManager database;
-
-        override public void Initialise() 
-        { 
-            m_log.Info("[SQLite]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// <list type="bullet">
-        /// <item>Initialises Inventory interface</item>
-        /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
-        /// <item>use default URI if connect string is empty.</item>
-        /// </list>
-        /// </summary>
-        /// <param name="dbconnect">connect string</param>
-        override public void Initialise(string connect)
-        {
-            database = new SQLiteManager(connect);
-        }
-
-        /// <summary>
-        /// Shuts down the grid interface
-        /// </summary>
-        override public void Dispose()
-        {
-            database.Close();
-        }
-
-        /// <summary>
-        /// Returns the name of this grid interface
-        /// </summary>
-        /// <returns>A string containing the grid interface</returns>
-        override public string Name
-        {
-            get { return "SQLite OpenGridData"; }
-        }
-
-        /// <summary>
-        /// Returns the version of this grid interface
-        /// </summary>
-        /// <returns>A string containing the version</returns>
-        override public string Version
-        {
-            get { return "0.1"; }
-        }
-
-        /// <summary>
-        /// Returns a list of regions within the specified ranges
-        /// </summary>
-        /// <param name="a">minimum X coordinate</param>
-        /// <param name="b">minimum Y coordinate</param>
-        /// <param name="c">maximum X coordinate</param>
-        /// <param name="d">maximum Y coordinate</param>
-        /// <returns>An array of region profiles</returns>
-        /// <remarks>NOT IMPLEMENTED ? always return null</remarks>
-        override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
-        {
-            return null;
-        }
-
-        
-        /// <summary>
-        /// Returns up to maxNum profiles of regions that have a name starting with namePrefix
-        /// </summary>
-        /// <param name="name">The name to match against</param>
-        /// <param name="maxNum">Maximum number of profiles to return</param>
-        /// <returns>A list of sim profiles</returns>
-        override public List<RegionProfileData> GetRegionsByName (string namePrefix, uint maxNum)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's handle
-        /// </summary>
-        /// <param name="handle">Region location handle</param>
-        /// <returns>Sim profile</returns>
-        override public RegionProfileData GetProfileByHandle(ulong handle)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["handle"] = handle.ToString();
-
-            IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
-            IDataReader reader = result.ExecuteReader();
-
-            RegionProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-
-            return row;
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's Region name string
-        /// </summary>
-        /// <param name="regionName">The region name search query</param>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByString(string regionName)
-        {
-            if (regionName.Length > 2)
-            {
-                Dictionary<string, string> param = new Dictionary<string, string>();
-                // Add % because this is a like query.
-                param["?regionName"] = regionName + "%";
-                // Only returns one record or no record.
-                IDbCommand result = database.Query("SELECT * FROM regions WHERE regionName like ?regionName LIMIT 1", param);
-                IDataReader reader = result.ExecuteReader();
-
-                RegionProfileData row = database.getRow(reader);
-                reader.Close();
-                result.Dispose();
-
-                return row;
-            }
-            else
-            {
-                //m_log.Error("[DATABASE]: Searched for a Region Name shorter then 3 characters");
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a sim profile from it's UUID
-        /// </summary>
-        /// <param name="uuid">The region UUID</param>
-        /// <returns>The sim profile</returns>
-        override public RegionProfileData GetProfileByUUID(UUID uuid)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["uuid"] = uuid.ToString();
-
-            IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
-            IDataReader reader = result.ExecuteReader();
-
-            RegionProfileData row = database.getRow(reader);
-            reader.Close();
-            result.Dispose();
-
-            return row;
-        }
-
-        /// <summary>
-        /// Returns a list of avatar and UUIDs that match the query
-        /// </summary>
-        /// <remarks>do nothing yet</remarks>
-        public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
-        {
-            //Do nothing yet
-            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
-            return returnlist;
-        }
-
-        /// <summary>
-        /// Adds a new specified region to the database
-        /// </summary>
-        /// <param name="profile">The profile to add</param>
-        /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse StoreProfile(RegionProfileData profile)
-        {
-            if (database.insertRow(profile))
-            {
-                return DataResponse.RESPONSE_OK;
-            }
-            else
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-
-        /// <summary>
-        /// Deletes a sim profile from the database
-        /// </summary>
-        /// <param name="uuid">the sim UUID</param>
-        /// <returns>Successful?</returns>
-        override public DataResponse DeleteProfile(string uuid)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["uuid"] = uuid;
-
-            IDbCommand result = database.Query("DELETE FROM regions WHERE uuid = @uuid", param);
-            if (result.ExecuteNonQuery() > 0)
-            {
-                return DataResponse.RESPONSE_OK;
-            }
-            return DataResponse.RESPONSE_ERROR;
-        }
-
-        /// <summary>
-        /// DEPRECATED. Attempts to authenticate a region by comparing a shared secret.
-        /// </summary>
-        /// <param name="uuid">The UUID of the challenger</param>
-        /// <param name="handle">The attempted regionHandle of the challenger</param>
-        /// <param name="authkey">The secret</param>
-        /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
-        override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
-        {
-            bool throwHissyFit = false; // Should be true by 1.0
-
-            if (throwHissyFit)
-                throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
-
-            RegionProfileData data = GetProfileByUUID(uuid);
-
-            return (handle == data.regionHandle && authkey == data.regionSecret);
-        }
-
-        /// <summary>
-        /// NOT YET FUNCTIONAL. Provides a cryptographic authentication of a region
-        /// </summary>
-        /// <remarks>This requires a security audit.</remarks>
-        /// <param name="uuid"></param>
-        /// <param name="handle"></param>
-        /// <param name="authhash"></param>
-        /// <param name="challenge"></param>
-        /// <returns></returns>
-        public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
-        {
-            // SHA512Managed HashProvider = new SHA512Managed();
-            // Encoding TextProvider = new UTF8Encoding();
-
-            // byte[] stream = TextProvider.GetBytes(uuid.ToString() + ":" + handle.ToString() + ":" + challenge);
-            // byte[] hash = HashProvider.ComputeHash(stream);
-
-            return false;
-        }
-
-        /// <summary>
-        /// NOT IMPLEMENTED
-        /// </summary>
-        /// <param name="x">x coordinate</param>
-        /// <param name="y">y coordinate</param>
-        /// <returns>always return null</returns>
-        override public ReservationData GetReservationAtPoint(uint x, uint y)
-        {
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 64591fd..a5e0517 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -46,10 +46,12 @@ namespace OpenSim.Data.SQLite
         private const string invItemsSelect = "select * from inventoryitems";
         private const string invFoldersSelect = "select * from inventoryfolders";
 
-        private SqliteConnection conn;
-        private DataSet ds;
-        private SqliteDataAdapter invItemsDa;
-        private SqliteDataAdapter invFoldersDa;
+        private static SqliteConnection conn;
+        private static DataSet ds;
+        private static SqliteDataAdapter invItemsDa;
+        private static SqliteDataAdapter invFoldersDa;
+
+        private static bool m_Initialized = false;
 
         public void Initialise()
         {
@@ -67,39 +69,44 @@ namespace OpenSim.Data.SQLite
         /// <param name="dbconnect">connect string</param>
         public void Initialise(string dbconnect)
         {
-            if (dbconnect == string.Empty)
+            if (!m_Initialized)
             {
-                dbconnect = "URI=file:inventoryStore.db,version=3";
-            }
-            m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
-            conn = new SqliteConnection(dbconnect);
+                m_Initialized = true;
+
+                if (dbconnect == string.Empty)
+                {
+                    dbconnect = "URI=file:inventoryStore.db,version=3";
+                }
+                m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
+                conn = new SqliteConnection(dbconnect);
 
-            conn.Open();
+                conn.Open();
 
-            Assembly assem = GetType().Assembly;
-            Migration m = new Migration(conn, assem, "InventoryStore");
-            m.Update();
+                Assembly assem = GetType().Assembly;
+                Migration m = new Migration(conn, assem, "InventoryStore");
+                m.Update();
 
-            SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn);
-            invItemsDa = new SqliteDataAdapter(itemsSelectCmd);
-            //            SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
+                SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn);
+                invItemsDa = new SqliteDataAdapter(itemsSelectCmd);
+                //            SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
 
-            SqliteCommand foldersSelectCmd = new SqliteCommand(invFoldersSelect, conn);
-            invFoldersDa = new SqliteDataAdapter(foldersSelectCmd);
+                SqliteCommand foldersSelectCmd = new SqliteCommand(invFoldersSelect, conn);
+                invFoldersDa = new SqliteDataAdapter(foldersSelectCmd);
 
-            ds = new DataSet();
+                ds = new DataSet();
 
-            ds.Tables.Add(createInventoryFoldersTable());
-            invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
-            setupFoldersCommands(invFoldersDa, conn);
-            m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
+                ds.Tables.Add(createInventoryFoldersTable());
+                invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
+                setupFoldersCommands(invFoldersDa, conn);
+                m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
 
-            ds.Tables.Add(createInventoryItemsTable());
-            invItemsDa.Fill(ds.Tables["inventoryitems"]);
-            setupItemsCommands(invItemsDa, conn);
-            m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
+                ds.Tables.Add(createInventoryItemsTable());
+                invItemsDa.Fill(ds.Tables["inventoryitems"]);
+                setupItemsCommands(invItemsDa, conn);
+                m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
 
-            ds.AcceptChanges();
+                ds.AcceptChanges();
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
deleted file mode 100644
index b6d4a1c..0000000
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SQLite;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-
-namespace OpenSim.Data.SQLite
-{
-    /// <summary>
-    /// SQLite Manager
-    /// </summary>
-    internal class SQLiteManager : SQLiteUtil
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private IDbConnection dbcon;
-
-        /// <summary>
-        /// <list type="bullet">
-        /// <item>Initialises and creates a new SQLite connection and maintains it.</item>
-        /// <item>use default URI if connect string is empty.</item>
-        /// </list>
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        public SQLiteManager(string connect)
-        {
-            try
-            {
-                string connectionString = String.Empty;
-                if (connect != String.Empty)
-                {
-                    connectionString = connect;
-                }
-                else
-                {
-                    m_log.Warn("[SQLITE] grid db not specified, using default");
-                    connectionString = "URI=file:GridServerSqlite.db;";
-                }
-
-                dbcon = new SQLiteConnection(connectionString);
-
-                dbcon.Open();
-            }
-            catch (Exception e)
-            {
-                throw new Exception("Error initialising SQLite Database: " + e.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Shuts down the database connection
-        /// </summary>
-        public void Close()
-        {
-            dbcon.Close();
-            dbcon = null;
-        }
-
-        /// <summary>
-        /// Runs a query with protection against SQL Injection by using parameterised input.
-        /// </summary>
-        /// <param name="sql">The SQL string - replace any variables such as WHERE x = "y" with WHERE x = @y</param>
-        /// <param name="parameters">The parameters - index so that @y is indexed as 'y'</param>
-        /// <returns>A SQLite DB Command</returns>
-        public IDbCommand Query(string sql, Dictionary<string, string> parameters)
-        {
-            SQLiteCommand dbcommand = (SQLiteCommand) dbcon.CreateCommand();
-            dbcommand.CommandText = sql;
-            foreach (KeyValuePair<string, string> param in parameters)
-            {
-                SQLiteParameter paramx = new SQLiteParameter(param.Key, param.Value);
-                dbcommand.Parameters.Add(paramx);
-            }
-
-            return (IDbCommand) dbcommand;
-        }
-
-        /// <summary>
-        /// Reads a region row from a database reader
-        /// </summary>
-        /// <param name="reader">An active database reader</param>
-        /// <returns>A region profile</returns>
-        public RegionProfileData getRow(IDataReader reader)
-        {
-            RegionProfileData retval = new RegionProfileData();
-
-            if (reader.Read())
-            {
-                // Region Main
-                retval.regionHandle = (ulong) reader["regionHandle"];
-                retval.regionName = (string) reader["regionName"];
-                retval.UUID = new UUID((string) reader["uuid"]);
-
-                // Secrets
-                retval.regionRecvKey = (string) reader["regionRecvKey"];
-                retval.regionSecret = (string) reader["regionSecret"];
-                retval.regionSendKey = (string) reader["regionSendKey"];
-
-                // Region Server
-                retval.regionDataURI = (string) reader["regionDataURI"];
-                retval.regionOnline = false; // Needs to be pinged before this can be set.
-                retval.serverIP = (string) reader["serverIP"];
-                retval.serverPort = (uint) reader["serverPort"];
-                retval.serverURI = (string) reader["serverURI"];
-
-                // Location
-                retval.regionLocX = (uint) ((int) reader["locX"]);
-                retval.regionLocY = (uint) ((int) reader["locY"]);
-                retval.regionLocZ = (uint) ((int) reader["locZ"]);
-
-                // Neighbours - 0 = No Override
-                retval.regionEastOverrideHandle = (ulong) reader["eastOverrideHandle"];
-                retval.regionWestOverrideHandle = (ulong) reader["westOverrideHandle"];
-                retval.regionSouthOverrideHandle = (ulong) reader["southOverrideHandle"];
-                retval.regionNorthOverrideHandle = (ulong) reader["northOverrideHandle"];
-
-                // Assets
-                retval.regionAssetURI = (string) reader["regionAssetURI"];
-                retval.regionAssetRecvKey = (string) reader["regionAssetRecvKey"];
-                retval.regionAssetSendKey = (string) reader["regionAssetSendKey"];
-
-                // Userserver
-                retval.regionUserURI = (string) reader["regionUserURI"];
-                retval.regionUserRecvKey = (string) reader["regionUserRecvKey"];
-                retval.regionUserSendKey = (string) reader["regionUserSendKey"];
-            }
-            else
-            {
-                throw new Exception("No rows to return");
-            }
-            return retval;
-        }
-
-        /// <summary>
-        /// Inserts a new region into the database
-        /// </summary>
-        /// <param name="profile">The region to insert</param>
-        /// <returns>Success?</returns>
-        public bool insertRow(RegionProfileData profile)
-        {
-            string sql =
-                "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
-            sql +=
-                "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
-            sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";
-
-            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";
-            sql +=
-                "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";
-            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";
-
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-
-            parameters["regionHandle"] = profile.regionHandle.ToString();
-            parameters["regionName"] = profile.regionName;
-            parameters["uuid"] = profile.UUID.ToString();
-            parameters["regionRecvKey"] = profile.regionRecvKey;
-            parameters["regionSendKey"] = profile.regionSendKey;
-            parameters["regionDataURI"] = profile.regionDataURI;
-            parameters["serverIP"] = profile.serverIP;
-            parameters["serverPort"] = profile.serverPort.ToString();
-            parameters["serverURI"] = profile.serverURI;
-            parameters["locX"] = profile.regionLocX.ToString();
-            parameters["locY"] = profile.regionLocY.ToString();
-            parameters["locZ"] = profile.regionLocZ.ToString();
-            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();
-            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();
-            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();
-            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();
-            parameters["regionAssetURI"] = profile.regionAssetURI;
-            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;
-            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;
-            parameters["regionUserURI"] = profile.regionUserURI;
-            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;
-            parameters["regionUserSendKey"] = profile.regionUserSendKey;
-
-            bool returnval = false;
-
-            try
-            {
-                IDbCommand result = Query(sql, parameters);
-
-                if (result.ExecuteNonQuery() == 1)
-                    returnval = true;
-
-                result.Dispose();
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-
-            return returnval;
-        }
-    }
-}
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 81c0703..d2ba9ae 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -272,13 +272,13 @@ namespace OpenSim.Data.SQLite
                 Commit();
             }
         }
-        public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
+        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             //This connector doesn't support the windlight module yet
             //Return default LL windlight settings
-            return new RegionMeta7WindlightData();
+            return new RegionLightShareData();
         }
-        public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
+        public void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             //This connector doesn't support the windlight module yet
         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
new file mode 100644
index 0000000..67cf716
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.SqliteClient;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData
+    {
+        public SQLiteUserAccountData(string connectionString, string realm)
+                : base(connectionString, realm, "UserAccount")
+        {
+        }
+
+        public UserAccountData[] GetUsers(UUID scopeID, string query)
+        {
+            string[] words = query.Split(new char[] {' '});
+
+            for (int i = 0 ; i < words.Length ; i++)
+            {
+                if (words[i].Length < 3)
+                {
+                    if (i != words.Length - 1)
+                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+                    Array.Resize(ref words, words.Length - 1);
+                }
+            }
+
+            if (words.Length == 0)
+                return new UserAccountData[0];
+
+            if (words.Length > 2)
+                return new UserAccountData[0];
+
+            SqliteCommand cmd = new SqliteCommand();
+
+            if (words.Length == 1)
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
+                    m_Realm, scopeID.ToString(), words[0]);
+            }
+            else
+            {
+                cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{3}%')", 
+                    m_Realm, scopeID.ToString(), words[0], words[1]);
+            }
+
+            return DoQuery(cmd);
+        }
+    }
+}
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
deleted file mode 100644
index caddcf8..0000000
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Reflection;
-using log4net;
-using Mono.Data.SqliteClient;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.SQLite
-{
-    /// <summary>
-    /// A User storage interface for the SQLite database system
-    /// </summary>
-    public class SQLiteUserData : UserDataBase
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The database manager
-        /// </summary>
-        /// <summary>
-        /// Artificial constructor called upon plugin load
-        /// </summary>
-        private const string SelectUserByUUID = "select * from users where UUID=:UUID";
-        private const string SelectUserByName = "select * from users where username=:username and surname=:surname";
-        private const string SelectFriendsByUUID = "select a.friendID, a.friendPerms, b.friendPerms from userfriends as a, userfriends as b where a.ownerID=:ownerID and b.ownerID=a.friendID and b.friendID=a.ownerID";
-
-        private const string userSelect = "select * from users";
-        private const string userFriendsSelect = "select a.ownerID as ownerID,a.friendID as friendID,a.friendPerms as friendPerms,b.friendPerms as ownerperms, b.ownerID as fownerID, b.friendID as ffriendID from userfriends as a, userfriends as b";
-        private const string userAgentSelect = "select * from useragents";
-        private const string AvatarAppearanceSelect = "select * from avatarappearance";
-
-        private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
-        private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
-
-        private DataSet ds;
-        private SqliteDataAdapter da;
-        private SqliteDataAdapter daf;
-        private SqliteDataAdapter dua;
-        private SqliteDataAdapter daa;
-        SqliteConnection g_conn;
-
-        public override void Initialise()
-        {
-            m_log.Info("[SQLiteUserData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
-        }
-
-        /// <summary>
-        /// <list type="bullet">
-        /// <item>Initialises User Interface</item>
-        /// <item>Loads and initialises a new SQLite connection and maintains it.</item>
-        /// <item>use default URI if connect string string is empty.</item>
-        /// </list>
-        /// </summary>
-        /// <param name="connect">connect string</param>
-        override public void Initialise(string connect)
-        {
-            // default to something sensible
-            if (connect == "")
-                connect = "URI=file:userprofiles.db,version=3";
-
-            SqliteConnection conn = new SqliteConnection(connect);
-
-            // This sucks, but It doesn't seem to work with the dataset Syncing :P
-            g_conn = conn;
-            g_conn.Open();
-
-            Assembly assem = GetType().Assembly;
-            Migration m = new Migration(g_conn, assem, "UserStore");
-            m.Update();
-
-
-            ds = new DataSet();
-            da = new SqliteDataAdapter(new SqliteCommand(userSelect, conn));
-            dua = new SqliteDataAdapter(new SqliteCommand(userAgentSelect, conn));
-            daf = new SqliteDataAdapter(new SqliteCommand(userFriendsSelect, conn));
-            daa = new SqliteDataAdapter(new SqliteCommand(AvatarAppearanceSelect, conn));
-            //if (daa == null) m_log.Info("[SQLiteUserData]: daa = null");
-
-            lock (ds)
-            {
-                ds.Tables.Add(createUsersTable());
-                ds.Tables.Add(createUserAgentsTable());
-                ds.Tables.Add(createUserFriendsTable());
-                ds.Tables.Add(createAvatarAppearanceTable());
-
-                setupUserCommands(da, conn);
-                da.Fill(ds.Tables["users"]);
-
-                setupAgentCommands(dua, conn);
-                dua.Fill(ds.Tables["useragents"]);
-
-                setupUserFriendsCommands(daf, conn);
-                daf.Fill(ds.Tables["userfriends"]);
-
-                setupAvatarAppearanceCommands(daa, conn);
-                daa.Fill(ds.Tables["avatarappearance"]);
-            }
-
-            return;
-        }
-
-        public override void Dispose ()
-        {
-            if (g_conn != null)
-            {
-                g_conn.Close();
-                g_conn = null;
-            }
-            if (ds != null)
-            {
-                ds.Dispose();
-                ds = null;
-            }
-            if (da != null)
-            {
-                da.Dispose();
-                da = null;
-            }
-            if (daf != null)
-            {
-                daf.Dispose();
-                daf = null;
-            }
-            if (dua != null)
-            {
-                dua.Dispose();
-                dua = null;
-            }
-            if (daa != null)
-            {
-                daa.Dispose();
-                daa = null;
-            }
-        }
-
-        /// <summary>
-        /// see IUserDataPlugin,
-        /// Get user data profile by UUID
-        /// </summary>
-        /// <param name="uuid">User UUID</param>
-        /// <returns>user profile data</returns>
-        override public UserProfileData GetUserByUUID(UUID uuid)
-        {
-            lock (ds)
-            {
-                DataRow row = ds.Tables["users"].Rows.Find(uuid.ToString());
-                if (row != null)
-                {
-                    UserProfileData user = buildUserProfile(row);
-                    return user;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// see IUserDataPlugin,
-        /// Get user data profile by name
-        /// </summary>
-        /// <param name="fname">first name</param>
-        /// <param name="lname">last name</param>
-        /// <returns>user profile data</returns>
-        override public UserProfileData GetUserByName(string fname, string lname)
-        {
-            string select = "surname = '" + lname + "' and username = '" + fname + "'";
-            lock (ds)
-            {
-                DataRow[] rows = ds.Tables["users"].Select(select);
-                if (rows.Length > 0)
-                {
-                    UserProfileData user = buildUserProfile(rows[0]);
-                    return user;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        #region User Friends List Data
-
-        private bool ExistsFriend(UUID owner, UUID friend)
-        {
-            string FindFriends = "select * from userfriends where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
-            using (SqliteCommand cmd = new SqliteCommand(FindFriends, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", owner.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
-                try
-                {
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        if (reader.Read())
-                        {
-                            reader.Close();
-                            return true;
-                        }
-                        else
-                        {
-                            reader.Close();
-                            return false;
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    m_log.Error("[USER DB]: Exception getting friends list for user: " + ex.ToString());
-                    return false;
-                }
-            }
-        }
-        /// <summary>
-        /// Add a new friend in the friendlist
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">UUID of the friend to add</param>
-        /// <param name="perms">permission flag</param>
-        override public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            if (ExistsFriend(friendlistowner, friend))
-                return;
-
-            string InsertFriends = "insert into userfriends(ownerID, friendID, friendPerms) values(:ownerID, :friendID, :perms)";
-            using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":perms", perms));
-                cmd.ExecuteNonQuery();
-            }
-            using (SqliteCommand cmd = new SqliteCommand(InsertFriends, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friend.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friendlistowner.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":perms", perms));
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Remove a user from the friendlist
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">UUID of the friend to remove</param>
-        override public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            string DeletePerms = "delete from userfriends where (ownerID=:ownerID and friendID=:friendID) or (ownerID=:friendID and friendID=:ownerID)";
-            using (SqliteCommand cmd = new SqliteCommand(DeletePerms, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Update the friendlist permission
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <param name="friend">UUID of the friend to modify</param>
-        /// <param name="perms">updated permission flag</param>
-        override public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            string UpdatePerms = "update userfriends set friendPerms=:perms where ownerID=:ownerID and friendID=:friendID";
-            using (SqliteCommand cmd = new SqliteCommand(UpdatePerms, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":perms", perms));
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
-                cmd.Parameters.Add(new SqliteParameter(":friendID", friend.ToString()));
-                cmd.ExecuteNonQuery();
-            }
-        }
-
-        /// <summary>
-        /// Get (fetch?) the friendlist for a user
-        /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <returns>The friendlist list</returns>
-        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            List<FriendListItem> returnlist = new List<FriendListItem>();
-
-            using (SqliteCommand cmd = new SqliteCommand(SelectFriendsByUUID, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":ownerID", friendlistowner.ToString()));
-
-                try
-                {
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            FriendListItem user = new FriendListItem();
-                            user.FriendListOwner = friendlistowner;
-                            user.Friend = new UUID((string)reader[0]);
-                            user.FriendPerms = Convert.ToUInt32(reader[1]);
-                            user.FriendListOwnerPerms = Convert.ToUInt32(reader[2]);
-                            returnlist.Add(user);
-                        }
-                        reader.Close();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    m_log.Error("[USER DB]: Exception getting friends list for user: " + ex.ToString());
-                }
-            }
-
-            return returnlist;
-        }
-
-        override public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
-        {
-            Dictionary<UUID, FriendRegionInfo> infos = new Dictionary<UUID,FriendRegionInfo>();
-
-            DataTable agents = ds.Tables["useragents"];
-            foreach (UUID uuid in uuids)
-            {
-                lock (ds)
-                {
-                    DataRow row = agents.Rows.Find(uuid.ToString());
-                    if (row == null) infos[uuid] = null;
-                    else
-                    {
-                        FriendRegionInfo fri = new FriendRegionInfo();
-                        fri.isOnline = (bool)row["agentOnline"];
-                        fri.regionHandle = Convert.ToUInt64(row["currentHandle"]);
-                        infos[uuid] = fri;
-                    }
-                }
-            }
-            return infos;
-        }
-
-        #endregion
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="queryID"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
-        {
-            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
-            string[] querysplit;
-            querysplit = query.Split(' ');
-            if (querysplit.Length == 2)
-            {
-                using (SqliteCommand cmd = new SqliteCommand(AvatarPickerAndSQL, g_conn))
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":username", querysplit[0] + "%"));
-                    cmd.Parameters.Add(new SqliteParameter(":surname", querysplit[1] + "%"));
-
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new UUID((string) reader["UUID"]);
-                            user.firstName = (string) reader["username"];
-                            user.lastName = (string) reader["surname"];
-                            returnlist.Add(user);
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-            else if (querysplit.Length == 1)
-            {
-                using (SqliteCommand cmd = new SqliteCommand(AvatarPickerOrSQL, g_conn))
-                {
-                    cmd.Parameters.Add(new SqliteParameter(":username", querysplit[0] + "%"));
-                    cmd.Parameters.Add(new SqliteParameter(":surname", querysplit[0] + "%"));
-
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        while (reader.Read())
-                        {
-                            AvatarPickerAvatar user = new AvatarPickerAvatar();
-                            user.AvatarID = new UUID((string) reader["UUID"]);
-                            user.firstName = (string) reader["username"];
-                            user.lastName = (string) reader["surname"];
-                            returnlist.Add(user);
-                        }
-                        reader.Close();
-                    }
-                }
-            }
-            return returnlist;
-        }
-
-        /// <summary>
-        /// Returns a user by UUID direct
-        /// </summary>
-        /// <param name="uuid">The user's account ID</param>
-        /// <returns>A matching user profile</returns>
-        override public UserAgentData GetAgentByUUID(UUID uuid)
-        {
-            lock (ds)
-            {
-                DataRow row = ds.Tables["useragents"].Rows.Find(uuid.ToString());
-                if (row != null)
-                {
-                    return buildUserAgent(row);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a session by account name
-        /// </summary>
-        /// <param name="name">The account name</param>
-        /// <returns>The user's session agent</returns>
-        override public UserAgentData GetAgentByName(string name)
-        {
-            return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
-        }
-
-        /// <summary>
-        /// Returns a session by account name
-        /// </summary>
-        /// <param name="fname">The first part of the user's account name</param>
-        /// <param name="lname">The second part of the user's account name</param>
-        /// <returns>A user agent</returns>
-        override public UserAgentData GetAgentByName(string fname, string lname)
-        {
-            UserAgentData agent = null;
-
-            UserProfileData profile = GetUserByName(fname, lname);
-            if (profile != null)
-            {
-                agent = GetAgentByUUID(profile.ID);
-            }
-            return agent;
-        }
-
-        /// <summary>
-        /// DEPRECATED? Store the weblogin key
-        /// </summary>
-        /// <param name="AgentID">UUID of the user</param>
-        /// <param name="WebLoginKey">UUID of the weblogin</param>
-        override public void StoreWebLoginKey(UUID AgentID, UUID WebLoginKey)
-        {
-            DataTable users = ds.Tables["users"];
-            lock (ds)
-            {
-                DataRow row = users.Rows.Find(AgentID.ToString());
-                if (row == null)
-                {
-                    m_log.Warn("[USER DB]: Unable to store new web login key for non-existant user");
-                }
-                else
-                {
-                    UserProfileData user = GetUserByUUID(AgentID);
-                    user.WebLoginKey = WebLoginKey;
-                    fillUserRow(row, user);
-                    da.Update(ds, "users");
-                }
-            }
-        }
-
-        private bool ExistsFirstLastName(String fname, String lname)
-        {
-            string FindUser = "select * from users where (username=:username and surname=:surname)";
-            using (SqliteCommand cmd = new SqliteCommand(FindUser, g_conn))
-            {
-                cmd.Parameters.Add(new SqliteParameter(":username", fname));
-                cmd.Parameters.Add(new SqliteParameter(":surname", lname));
-                try
-                {
-                    using (IDataReader reader = cmd.ExecuteReader())
-                    {
-                        if (reader.Read())
-                        {
-                            reader.Close();
-                            return true;
-                        }
-                        else
-                        {
-                            reader.Close();
-                            return false;
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    m_log.Error("[USER DB]: Exception searching for user's first and last name: " + ex.ToString());
-                    return false;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a new user profile
-        /// </summary>
-        /// <param name="user">The profile to add to the database</param>
-        override public void AddNewUserProfile(UserProfileData user)
-        {
-            DataTable users = ds.Tables["users"];
-            UUID zero = UUID.Zero;
-            if (ExistsFirstLastName(user.FirstName, user.SurName) || user.ID == zero)
-                return;
-
-            lock (ds)
-            {
-                DataRow row = users.Rows.Find(user.ID.ToString());
-                if (row == null)
-                {
-                    row = users.NewRow();
-                    fillUserRow(row, user);
-                    users.Rows.Add(row);
-
-                    m_log.Debug("[USER DB]: Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
-
-                    // save changes off to disk
-                    da.Update(ds, "users");
-                }
-                else
-                {
-                    m_log.WarnFormat("[USER DB]: Ignoring add since user with id {0} already exists", user.ID);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a new user profile
-        /// </summary>
-        /// <param name="user">The profile to add to the database</param>
-        /// <returns>True on success, false on error</returns>
-        override public bool UpdateUserProfile(UserProfileData user)
-        {
-            DataTable users = ds.Tables["users"];
-            lock (ds)
-            {
-                DataRow row = users.Rows.Find(user.ID.ToString());
-                if (row == null)
-                {
-                    return false;
-                }
-                else
-                {
-                    fillUserRow(row, user);
-                    da.Update(ds, "users");
-                }
-            }
-
-            //AddNewUserProfile(user);
-            return true;
-        }
-
-        /// <summary>
-        /// Creates a new user agent
-        /// </summary>
-        /// <param name="agent">The agent to add to the database</param>
-        override public void AddNewUserAgent(UserAgentData agent)
-        {
-            UUID zero = UUID.Zero;
-            if (agent.SessionID == zero || agent.ProfileID == zero)
-                return;
-
-            DataTable agents = ds.Tables["useragents"];
-            lock (ds)
-            {
-                DataRow row = agents.Rows.Find(agent.ProfileID.ToString());
-                if (row == null)
-                {
-                    row = agents.NewRow();
-                    fillUserAgentRow(row, agent);
-                    agents.Rows.Add(row);
-                }
-                else
-                {
-                    fillUserAgentRow(row, agent);
-
-                }
-                m_log.Info("[USER DB]: Syncing useragent database: " + ds.Tables["useragents"].Rows.Count + " agents stored");
-                // save changes off to disk
-                dua.Update(ds, "useragents");
-            }
-        }
-
-        /// <summary>
-        /// Transfers money between two user accounts
-        /// </summary>
-        /// <param name="from">Starting account</param>
-        /// <param name="to">End account</param>
-        /// <param name="amount">The amount to move</param>
-        /// <returns>Success?</returns>
-        override public bool MoneyTransferRequest(UUID from, UUID to, uint amount)
-        {
-            return false; // for consistency with the MySQL impl
-        }
-
-        /// <summary>
-        /// Transfers inventory between two accounts
-        /// </summary>
-        /// <remarks>Move to inventory server</remarks>
-        /// <param name="from">Senders account</param>
-        /// <param name="to">Receivers account</param>
-        /// <param name="item">Inventory item</param>
-        /// <returns>Success?</returns>
-        override public bool InventoryTransferRequest(UUID from, UUID to, UUID item)
-        {
-            return false; //for consistency with the MySQL impl
-        }
-
-
-        /// <summary>
-        /// Appearance.
-        /// TODO: stubs for now to do in memory appearance.
-        /// </summary>
-        /// <param name="user">The user UUID</param>
-        /// <returns>Avatar Appearence</returns>
-        override public AvatarAppearance GetUserAppearance(UUID user)
-        {
-            m_log.Info("[APPEARANCE] GetUserAppearance " + user.ToString());
-
-            AvatarAppearance aa = new AvatarAppearance(user);
-            //try {
-            aa.Owner = user;
-
-            DataTable aap = ds.Tables["avatarappearance"];
-            lock (ds)
-            {
-                DataRow row = aap.Rows.Find(Util.ToRawUuidString(user));
-                if (row == null)
-                {
-                    m_log.Info("[APPEARANCE] Could not find appearance for " + user.ToString());
-
-                    //m_log.Debug("[USER DB]: Creating avatarappearance For: " + user.ToString());
-
-                    //row = aap.NewRow();
-                    //fillAvatarAppearanceRow(row, user, appearance);
-                    //aap.Rows.Add(row);
-                    //    m_log.Debug("[USER DB]: Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
-                    // save changes off to disk
-                    //daa.Update(ds, "avatarappearance");
-                }
-                else
-                {
-                    m_log.InfoFormat("[APPEARANCE] appearance found for {0}", user.ToString());
-
-                    aa.BodyAsset        = new UUID((String)row["BodyAsset"]);
-                    aa.BodyItem         = new UUID((String)row["BodyItem"]);
-                    aa.SkinItem         = new UUID((String)row["SkinItem"]);
-                    aa.SkinAsset        = new UUID((String)row["SkinAsset"]);
-                    aa.HairItem         = new UUID((String)row["HairItem"]);
-                    aa.HairAsset        = new UUID((String)row["HairAsset"]);
-                    aa.EyesItem         = new UUID((String)row["EyesItem"]);
-                    aa.EyesAsset        = new UUID((String)row["EyesAsset"]);
-                    aa.ShirtItem        = new UUID((String)row["ShirtItem"]);
-                    aa.ShirtAsset       = new UUID((String)row["ShirtAsset"]);
-                    aa.PantsItem        = new UUID((String)row["PantsItem"]);
-                    aa.PantsAsset       = new UUID((String)row["PantsAsset"]);
-                    aa.ShoesItem        = new UUID((String)row["ShoesItem"]);
-                    aa.ShoesAsset       = new UUID((String)row["ShoesAsset"]);
-                    aa.SocksItem        = new UUID((String)row["SocksItem"]);
-                    aa.SocksAsset       = new UUID((String)row["SocksAsset"]);
-                    aa.JacketItem       = new UUID((String)row["JacketItem"]);
-                    aa.JacketAsset      = new UUID((String)row["JacketAsset"]);
-                    aa.GlovesItem       = new UUID((String)row["GlovesItem"]);
-                    aa.GlovesAsset      = new UUID((String)row["GlovesAsset"]);
-                    aa.UnderShirtItem   = new UUID((String)row["UnderShirtItem"]);
-                    aa.UnderShirtAsset  = new UUID((String)row["UnderShirtAsset"]);
-                    aa.UnderPantsItem   = new UUID((String)row["UnderPantsItem"]);
-                    aa.UnderPantsAsset  = new UUID((String)row["UnderPantsAsset"]);
-                    aa.SkirtItem        = new UUID((String)row["SkirtItem"]);
-                    aa.SkirtAsset       = new UUID((String)row["SkirtAsset"]);
-
-                    // Ewe Loon
-                    //  Used Base64String because for some reason it wont accept using Byte[] (which works in Region date)
-
-                    String str = (String)row["Texture"];
-                    byte[] texture = Convert.FromBase64String(str);
-                    aa.Texture = new Primitive.TextureEntry(texture, 0, texture.Length);
-
-                    str = (String)row["VisualParams"];
-                    byte[] VisualParams = Convert.FromBase64String(str);
-                    aa.VisualParams = VisualParams;
-
-                    aa.Serial = Convert.ToInt32(row["Serial"]);
-                    aa.AvatarHeight = Convert.ToSingle(row["AvatarHeight"]);
-                    m_log.InfoFormat("[APPEARANCE] appearance set for {0}", user.ToString());
-                }
-            }
-
-           //     m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
-           // } catch (KeyNotFoundException) {
-           //     m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
-           // }
-            return aa;
-        }
-
-        /// <summary>
-        /// Update a user appearence
-        /// </summary>
-        /// <param name="user">the user UUID</param>
-        /// <param name="appearance">appearence</param>
-        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
-        {
-            appearance.Owner = user;
-            DataTable aap = ds.Tables["avatarappearance"];
-            lock (ds)
-            {
-                DataRow row = aap.Rows.Find(Util.ToRawUuidString(user));
-                if (row == null)
-                {
-                    m_log.Debug("[USER DB]: Creating UserAppearance For: " + user.ToString());
-
-                    row = aap.NewRow();
-                    fillAvatarAppearanceRow(row, user, appearance);
-                    aap.Rows.Add(row);
-                    //    m_log.Debug("[USER DB]: Syncing user database: " + ds.Tables["users"].Rows.Count + " users stored");
-                    // save changes off to disk
-                    daa.Update(ds, "avatarappearance");
-                }
-                else
-                {
-                    m_log.Debug("[USER DB]: Updating UserAppearance For: " + user.ToString());
-                    fillAvatarAppearanceRow(row, user, appearance);
-                    daa.Update(ds, "avatarappearance");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns the name of the storage provider
-        /// </summary>
-        /// <returns>Storage provider name</returns>
-        override public string Name
-        {
-            get {return "Sqlite Userdata";}
-        }
-
-        /// <summary>
-        /// Returns the version of the storage provider
-        /// </summary>
-        /// <returns>Storage provider version</returns>
-        override public string Version
-        {
-            get {return "0.1";}
-        }
-
-        /***********************************************************************
-         *
-         *  DataTable creation
-         *
-         **********************************************************************/
-        /***********************************************************************
-         *
-         *  Database Definition Functions
-         *
-         *  This should be db agnostic as we define them in ADO.NET terms
-         *
-         **********************************************************************/
-
-        /// <summary>
-        /// Create the "users" table
-        /// </summary>
-        /// <returns>DataTable</returns>
-        private static DataTable createUsersTable()
-        {
-            DataTable users = new DataTable("users");
-
-            SQLiteUtil.createCol(users, "UUID", typeof (String));
-            SQLiteUtil.createCol(users, "username", typeof (String));
-            SQLiteUtil.createCol(users, "surname", typeof (String));
-            SQLiteUtil.createCol(users, "email", typeof (String));
-            SQLiteUtil.createCol(users, "passwordHash", typeof (String));
-            SQLiteUtil.createCol(users, "passwordSalt", typeof (String));
-
-            SQLiteUtil.createCol(users, "homeRegionX", typeof (Int32));
-            SQLiteUtil.createCol(users, "homeRegionY", typeof (Int32));
-            SQLiteUtil.createCol(users, "homeRegionID", typeof (String));
-            SQLiteUtil.createCol(users, "homeLocationX", typeof (Double));
-            SQLiteUtil.createCol(users, "homeLocationY", typeof (Double));
-            SQLiteUtil.createCol(users, "homeLocationZ", typeof (Double));
-            SQLiteUtil.createCol(users, "homeLookAtX", typeof (Double));
-            SQLiteUtil.createCol(users, "homeLookAtY", typeof (Double));
-            SQLiteUtil.createCol(users, "homeLookAtZ", typeof (Double));
-            SQLiteUtil.createCol(users, "created", typeof (Int32));
-            SQLiteUtil.createCol(users, "lastLogin", typeof (Int32));
-
-            //TODO: Please delete this column.  It's now a brick
-            SQLiteUtil.createCol(users, "rootInventoryFolderID", typeof (String));
-
-            SQLiteUtil.createCol(users, "userInventoryURI", typeof (String));
-            SQLiteUtil.createCol(users, "userAssetURI", typeof (String));
-            SQLiteUtil.createCol(users, "profileCanDoMask", typeof (Int32));
-            SQLiteUtil.createCol(users, "profileWantDoMask", typeof (Int32));
-            SQLiteUtil.createCol(users, "profileAboutText", typeof (String));
-            SQLiteUtil.createCol(users, "profileFirstText", typeof (String));
-            SQLiteUtil.createCol(users, "profileImage", typeof (String));
-            SQLiteUtil.createCol(users, "profileFirstImage", typeof (String));
-            SQLiteUtil.createCol(users, "webLoginKey", typeof(String));
-            SQLiteUtil.createCol(users, "userFlags", typeof (Int32));
-            SQLiteUtil.createCol(users, "godLevel", typeof (Int32));
-            SQLiteUtil.createCol(users, "customType", typeof (String));
-            SQLiteUtil.createCol(users, "partner", typeof (String));
-            // Add in contraints
-            users.PrimaryKey = new DataColumn[] {users.Columns["UUID"]};
-            return users;
-        }
-
-        /// <summary>
-        /// Create the "useragents" table
-        /// </summary>
-        /// <returns>Data Table</returns>
-        private static DataTable createUserAgentsTable()
-        {
-            DataTable ua = new DataTable("useragents");
-            // this is the UUID of the user
-            SQLiteUtil.createCol(ua, "UUID", typeof (String));
-            SQLiteUtil.createCol(ua, "agentIP", typeof (String));
-            SQLiteUtil.createCol(ua, "agentPort", typeof (Int32));
-            SQLiteUtil.createCol(ua, "agentOnline", typeof (Boolean));
-            SQLiteUtil.createCol(ua, "sessionID", typeof (String));
-            SQLiteUtil.createCol(ua, "secureSessionID", typeof (String));
-            SQLiteUtil.createCol(ua, "regionID", typeof (String));
-            SQLiteUtil.createCol(ua, "loginTime", typeof (Int32));
-            SQLiteUtil.createCol(ua, "logoutTime", typeof (Int32));
-            SQLiteUtil.createCol(ua, "currentRegion", typeof (String));
-            SQLiteUtil.createCol(ua, "currentHandle", typeof (String));
-            // vectors
-            SQLiteUtil.createCol(ua, "currentPosX", typeof (Double));
-            SQLiteUtil.createCol(ua, "currentPosY", typeof (Double));
-            SQLiteUtil.createCol(ua, "currentPosZ", typeof (Double));
-            // constraints
-            ua.PrimaryKey = new DataColumn[] {ua.Columns["UUID"]};
-
-            return ua;
-        }
-
-        /// <summary>
-        /// Create the "userfriends" table
-        /// </summary>
-        /// <returns>Data Table</returns>
-        private static DataTable createUserFriendsTable()
-        {
-            DataTable ua = new DataTable("userfriends");
-            // table contains user <----> user relationship with perms
-            SQLiteUtil.createCol(ua, "ownerID", typeof(String));
-            SQLiteUtil.createCol(ua, "friendID", typeof(String));
-            SQLiteUtil.createCol(ua, "friendPerms", typeof(Int32));
-            SQLiteUtil.createCol(ua, "ownerPerms", typeof(Int32));
-            SQLiteUtil.createCol(ua, "datetimestamp", typeof(Int32));
-
-            return ua;
-        }
-
-        /// <summary>
-        /// Create the "avatarappearance" table
-        /// </summary>
-        /// <returns>Data Table</returns>
-        private static DataTable createAvatarAppearanceTable()
-        {
-            DataTable aa = new DataTable("avatarappearance");
-            // table contains user appearance items
-
-            SQLiteUtil.createCol(aa, "Owner", typeof(String));
-            SQLiteUtil.createCol(aa, "BodyItem", typeof(String));
-            SQLiteUtil.createCol(aa, "BodyAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "SkinItem", typeof(String));
-            SQLiteUtil.createCol(aa, "SkinAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "HairItem", typeof(String));
-            SQLiteUtil.createCol(aa, "HairAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "EyesItem", typeof(String));
-            SQLiteUtil.createCol(aa, "EyesAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "ShirtItem", typeof(String));
-            SQLiteUtil.createCol(aa, "ShirtAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "PantsItem", typeof(String));
-            SQLiteUtil.createCol(aa, "PantsAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "ShoesItem", typeof(String));
-            SQLiteUtil.createCol(aa, "ShoesAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "SocksItem", typeof(String));
-            SQLiteUtil.createCol(aa, "SocksAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "JacketItem", typeof(String));
-            SQLiteUtil.createCol(aa, "JacketAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "GlovesItem", typeof(String));
-            SQLiteUtil.createCol(aa, "GlovesAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "UnderShirtItem", typeof(String));
-            SQLiteUtil.createCol(aa, "UnderShirtAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "UnderPantsItem", typeof(String));
-            SQLiteUtil.createCol(aa, "UnderPantsAsset", typeof(String));
-            SQLiteUtil.createCol(aa, "SkirtItem", typeof(String));
-            SQLiteUtil.createCol(aa, "SkirtAsset", typeof(String));
-
-            //  Used Base64String because for some reason it wont accept using Byte[] (which works in Region date)
-            SQLiteUtil.createCol(aa, "Texture", typeof (String));
-            SQLiteUtil.createCol(aa, "VisualParams", typeof (String));
-
-            SQLiteUtil.createCol(aa, "Serial", typeof(Int32));
-            SQLiteUtil.createCol(aa, "AvatarHeight", typeof(Double));
-
-            aa.PrimaryKey = new DataColumn[] { aa.Columns["Owner"] };
-
-            return aa;
-        }
-
-        /***********************************************************************
-         *
-         *  Convert between ADO.NET <=> OpenSim Objects
-         *
-         *  These should be database independant
-         *
-         **********************************************************************/
-
-        /// <summary>
-        /// TODO: this doesn't work yet because something more
-        /// interesting has to be done to actually get these values
-        /// back out.  Not enough time to figure it out yet.
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private static UserProfileData buildUserProfile(DataRow row)
-        {
-            UserProfileData user = new UserProfileData();
-            UUID tmp;
-            UUID.TryParse((String)row["UUID"], out tmp);
-            user.ID = tmp;
-            user.FirstName = (String) row["username"];
-            user.SurName = (String) row["surname"];
-            user.Email = (row.IsNull("email")) ? "" : (String) row["email"];
-
-            user.PasswordHash = (String) row["passwordHash"];
-            user.PasswordSalt = (String) row["passwordSalt"];
-
-            user.HomeRegionX = Convert.ToUInt32(row["homeRegionX"]);
-            user.HomeRegionY = Convert.ToUInt32(row["homeRegionY"]);
-            user.HomeLocation = new Vector3(
-                Convert.ToSingle(row["homeLocationX"]),
-                Convert.ToSingle(row["homeLocationY"]),
-                Convert.ToSingle(row["homeLocationZ"])
-                );
-            user.HomeLookAt = new Vector3(
-                Convert.ToSingle(row["homeLookAtX"]),
-                Convert.ToSingle(row["homeLookAtY"]),
-                Convert.ToSingle(row["homeLookAtZ"])
-                );
-
-            UUID regionID = UUID.Zero;
-            UUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use UUID.Zero
-            user.HomeRegionID = regionID;
-
-            user.Created = Convert.ToInt32(row["created"]);
-            user.LastLogin = Convert.ToInt32(row["lastLogin"]);
-            user.UserInventoryURI = (String) row["userInventoryURI"];
-            user.UserAssetURI = (String) row["userAssetURI"];
-            user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
-            user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
-            user.AboutText = (String) row["profileAboutText"];
-            user.FirstLifeAboutText = (String) row["profileFirstText"];
-            UUID.TryParse((String)row["profileImage"], out tmp);
-            user.Image = tmp;
-            UUID.TryParse((String)row["profileFirstImage"], out tmp);
-            user.FirstLifeImage = tmp;
-            user.WebLoginKey = new UUID((String) row["webLoginKey"]);
-            user.UserFlags = Convert.ToInt32(row["userFlags"]);
-            user.GodLevel = Convert.ToInt32(row["godLevel"]);
-            user.CustomType = row["customType"].ToString();
-            user.Partner = new UUID((String) row["partner"]);
-
-            return user;
-        }
-
-        /// <summary>
-        /// Persist user profile data
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="user"></param>
-        private void fillUserRow(DataRow row, UserProfileData user)
-        {
-            row["UUID"] = user.ID.ToString();
-            row["username"] = user.FirstName;
-            row["surname"] = user.SurName;
-            row["email"] = user.Email;
-            row["passwordHash"] = user.PasswordHash;
-            row["passwordSalt"] = user.PasswordSalt;
-
-            row["homeRegionX"] = user.HomeRegionX;
-            row["homeRegionY"] = user.HomeRegionY;
-            row["homeRegionID"] = user.HomeRegionID.ToString();
-            row["homeLocationX"] = user.HomeLocation.X;
-            row["homeLocationY"] = user.HomeLocation.Y;
-            row["homeLocationZ"] = user.HomeLocation.Z;
-            row["homeLookAtX"] = user.HomeLookAt.X;
-            row["homeLookAtY"] = user.HomeLookAt.Y;
-            row["homeLookAtZ"] = user.HomeLookAt.Z;
-
-            row["created"] = user.Created;
-            row["lastLogin"] = user.LastLogin;
-            //TODO: Get rid of rootInventoryFolderID in a safe way.
-            row["rootInventoryFolderID"] = UUID.Zero.ToString();
-            row["userInventoryURI"] = user.UserInventoryURI;
-            row["userAssetURI"] = user.UserAssetURI;
-            row["profileCanDoMask"] = user.CanDoMask;
-            row["profileWantDoMask"] = user.WantDoMask;
-            row["profileAboutText"] = user.AboutText;
-            row["profileFirstText"] = user.FirstLifeAboutText;
-            row["profileImage"] = user.Image.ToString();
-            row["profileFirstImage"] = user.FirstLifeImage.ToString();
-            row["webLoginKey"] = user.WebLoginKey.ToString();
-            row["userFlags"] = user.UserFlags;
-            row["godLevel"] = user.GodLevel;
-            row["customType"] = user.CustomType == null ? "" : user.CustomType;
-            row["partner"] = user.Partner.ToString();
-
-            // ADO.NET doesn't handle NULL very well
-            foreach (DataColumn col in ds.Tables["users"].Columns)
-            {
-                if (row[col] == null)
-                {
-                    row[col] = String.Empty;
-                }
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="user"></param>
-        private void fillAvatarAppearanceRow(DataRow row, UUID user, AvatarAppearance appearance)
-        {
-            row["Owner"] = Util.ToRawUuidString(user);
-            row["BodyItem"] = appearance.BodyItem.ToString();
-            row["BodyAsset"] = appearance.BodyAsset.ToString();
-            row["SkinItem"] = appearance.SkinItem.ToString();
-            row["SkinAsset"] = appearance.SkinAsset.ToString();
-            row["HairItem"] = appearance.HairItem.ToString();
-            row["HairAsset"] = appearance.HairAsset.ToString();
-            row["EyesItem"] = appearance.EyesItem.ToString();
-            row["EyesAsset"] = appearance.EyesAsset.ToString();
-            row["ShirtItem"] = appearance.ShirtItem.ToString();
-            row["ShirtAsset"] = appearance.ShirtAsset.ToString();
-            row["PantsItem"] = appearance.PantsItem.ToString();
-            row["PantsAsset"] = appearance.PantsAsset.ToString();
-            row["ShoesItem"] = appearance.ShoesItem.ToString();
-            row["ShoesAsset"] = appearance.ShoesAsset.ToString();
-            row["SocksItem"] = appearance.SocksItem.ToString();
-            row["SocksAsset"] = appearance.SocksAsset.ToString();
-            row["JacketItem"] = appearance.JacketItem.ToString();
-            row["JacketAsset"] = appearance.JacketAsset.ToString();
-            row["GlovesItem"] = appearance.GlovesItem.ToString();
-            row["GlovesAsset"] = appearance.GlovesAsset.ToString();
-            row["UnderShirtItem"] = appearance.UnderShirtItem.ToString();
-            row["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString();
-            row["UnderPantsItem"] = appearance.UnderPantsItem.ToString();
-            row["UnderPantsAsset"] = appearance.UnderPantsAsset.ToString();
-            row["SkirtItem"] = appearance.SkirtItem.ToString();
-            row["SkirtAsset"] = appearance.SkirtAsset.ToString();
-
-            //  Used Base64String because for some reason it wont accept using Byte[] (which works in Region date)
-            row["Texture"] = Convert.ToBase64String(appearance.Texture.GetBytes());
-            row["VisualParams"] = Convert.ToBase64String(appearance.VisualParams);
-
-            row["Serial"] = appearance.Serial;
-            row["AvatarHeight"] = appearance.AvatarHeight;
-
-            // ADO.NET doesn't handle NULL very well
-            foreach (DataColumn col in ds.Tables["avatarappearance"].Columns)
-            {
-                if (row[col] == null)
-                {
-                    row[col] = String.Empty;
-                }
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <returns></returns>
-        private static UserAgentData buildUserAgent(DataRow row)
-        {
-            UserAgentData ua = new UserAgentData();
-
-            UUID tmp;
-            UUID.TryParse((String)row["UUID"], out tmp);
-            ua.ProfileID = tmp;
-            ua.AgentIP = (String)row["agentIP"];
-            ua.AgentPort = Convert.ToUInt32(row["agentPort"]);
-            ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
-            ua.SessionID = new UUID((String) row["sessionID"]);
-            ua.SecureSessionID = new UUID((String) row["secureSessionID"]);
-            ua.InitialRegion = new UUID((String) row["regionID"]);
-            ua.LoginTime = Convert.ToInt32(row["loginTime"]);
-            ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
-            ua.Region = new UUID((String) row["currentRegion"]);
-            ua.Handle = Convert.ToUInt64(row["currentHandle"]);
-            ua.Position = new Vector3(
-                Convert.ToSingle(row["currentPosX"]),
-                Convert.ToSingle(row["currentPosY"]),
-                Convert.ToSingle(row["currentPosZ"])
-                );
-            ua.LookAt = new Vector3(
-                Convert.ToSingle(row["currentLookAtX"]),
-                Convert.ToSingle(row["currentLookAtY"]),
-                Convert.ToSingle(row["currentLookAtZ"])
-                );
-            return ua;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="row"></param>
-        /// <param name="ua"></param>
-        private static void fillUserAgentRow(DataRow row, UserAgentData ua)
-        {
-            row["UUID"] = ua.ProfileID.ToString();
-            row["agentIP"] = ua.AgentIP;
-            row["agentPort"] = ua.AgentPort;
-            row["agentOnline"] = ua.AgentOnline;
-            row["sessionID"] = ua.SessionID.ToString();
-            row["secureSessionID"] = ua.SecureSessionID.ToString();
-            row["regionID"] = ua.InitialRegion.ToString();
-            row["loginTime"] = ua.LoginTime;
-            row["logoutTime"] = ua.LogoutTime;
-            row["currentRegion"] = ua.Region.ToString();
-            row["currentHandle"] = ua.Handle.ToString();
-            // vectors
-            row["currentPosX"] = ua.Position.X;
-            row["currentPosY"] = ua.Position.Y;
-            row["currentPosZ"] = ua.Position.Z;
-            row["currentLookAtX"] = ua.LookAt.X;
-            row["currentLookAtY"] = ua.LookAt.Y;
-            row["currentLookAtZ"] = ua.LookAt.Z;
-        }
-
-        /***********************************************************************
-         *
-         *  Database Binding functions
-         *
-         *  These will be db specific due to typing, and minor differences
-         *  in databases.
-         *
-         **********************************************************************/
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="da"></param>
-        /// <param name="conn"></param>
-        private void setupUserCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            da.InsertCommand = SQLiteUtil.createInsertCommand("users", ds.Tables["users"]);
-            da.InsertCommand.Connection = conn;
-
-            da.UpdateCommand = SQLiteUtil.createUpdateCommand("users", "UUID=:UUID", ds.Tables["users"]);
-            da.UpdateCommand.Connection = conn;
-
-            SqliteCommand delete = new SqliteCommand("delete from users where UUID = :UUID");
-            delete.Parameters.Add(SQLiteUtil.createSqliteParameter("UUID", typeof(String)));
-            delete.Connection = conn;
-            da.DeleteCommand = delete;
-        }
-
-        private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn)
-        {
-            da.InsertCommand = SQLiteUtil.createInsertCommand("useragents", ds.Tables["useragents"]);
-            da.InsertCommand.Connection = conn;
-
-            da.UpdateCommand = SQLiteUtil.createUpdateCommand("useragents", "UUID=:UUID", ds.Tables["useragents"]);
-            da.UpdateCommand.Connection = conn;
-
-            SqliteCommand delete = new SqliteCommand("delete from useragents where UUID = :ProfileID");
-            delete.Parameters.Add(SQLiteUtil.createSqliteParameter("ProfileID", typeof(String)));
-            delete.Connection = conn;
-            da.DeleteCommand = delete;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="daf"></param>
-        /// <param name="conn"></param>
-        private void setupUserFriendsCommands(SqliteDataAdapter daf, SqliteConnection conn)
-        {
-            daf.InsertCommand = SQLiteUtil.createInsertCommand("userfriends", ds.Tables["userfriends"]);
-            daf.InsertCommand.Connection = conn;
-
-            daf.UpdateCommand = SQLiteUtil.createUpdateCommand("userfriends", "ownerID=:ownerID and friendID=:friendID", ds.Tables["userfriends"]);
-            daf.UpdateCommand.Connection = conn;
-
-            SqliteCommand delete = new SqliteCommand("delete from userfriends where ownerID=:ownerID and friendID=:friendID");
-            delete.Parameters.Add(SQLiteUtil.createSqliteParameter("ownerID", typeof(String)));
-            delete.Parameters.Add(SQLiteUtil.createSqliteParameter("friendID", typeof(String)));
-            delete.Connection = conn;
-            daf.DeleteCommand = delete;
-
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="daf"></param>
-        /// <param name="conn"></param>
-        private void setupAvatarAppearanceCommands(SqliteDataAdapter daa, SqliteConnection conn)
-        {
-            daa.InsertCommand = SQLiteUtil.createInsertCommand("avatarappearance", ds.Tables["avatarappearance"]);
-            daa.InsertCommand.Connection = conn;
-
-            daa.UpdateCommand = SQLiteUtil.createUpdateCommand("avatarappearance", "Owner=:Owner", ds.Tables["avatarappearance"]);
-            daa.UpdateCommand.Connection = conn;
-
-            SqliteCommand delete = new SqliteCommand("delete from avatarappearance where Owner=:Owner");
-            delete.Parameters.Add(SQLiteUtil.createSqliteParameter("Owner", typeof(String)));
-            delete.Connection = conn;
-            daa.DeleteCommand = delete;
-        }
-
-
-        override public void ResetAttachments(UUID userID)
-        {
-        }
-
-        override public void LogoutUsers(UUID regionID)
-        {
-        }
-    }
-}
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 5c93f88..a66e0c6 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Data.SQLite
             cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParent));
             cmd.Parameters.Add(new SqliteParameter(":InventoryID", id));
 
-            return ExecuteNonQuery(cmd) == 0 ? false : true;
+            return ExecuteNonQuery(cmd, m_Connection) == 0 ? false : true;
         }
 
         public XInventoryItem[] GetActiveGestures(UUID principalID)
@@ -137,7 +137,7 @@ namespace OpenSim.Data.SQLite
             cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
             cmd.Parameters.Add(new SqliteParameter(":AssetID", assetID.ToString()));
 
-            IDataReader reader = ExecuteReader(cmd);
+            IDataReader reader = ExecuteReader(cmd, m_Connection);
 
             int perms = 0;
 
@@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
             }
 
             reader.Close();
-            CloseReaderCommand(cmd);
+            CloseCommand(cmd);
 
             return perms;
         }
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 25aed61..e80cff9 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -66,9 +66,9 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_StoreSimpleAsset()
         {
-            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture);
-            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture);
-            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture);
+            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());
             a1.Data = asset1;
             a2.Data = asset1;
             a3.Data = asset1;
@@ -78,12 +78,15 @@ namespace OpenSim.Data.Tests
                 .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);
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index 907bb38..d14d405 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Data.Tests
         public void T012_EstateSettingsRandomStorage()
         {
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
             new PropertyScrambler<EstateSettings>()
                 .DontScramble(x=>x.EstateID)
                 .Scramble(originalSettings);
@@ -167,7 +167,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID, true);
 
             // Checking that loaded values are correct.
             Assert.That(loadedSettings, Constraints.PropertyCompareConstraint(originalSettings));
@@ -177,7 +177,7 @@ namespace OpenSim.Data.Tests
         public void T020_EstateSettingsManagerList()
         {
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
             originalSettings.EstateManagers = new UUID[] { MANAGER_ID_1, MANAGER_ID_2 };
 
@@ -185,7 +185,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID, true);
 
             Assert.AreEqual(2, loadedSettings.EstateManagers.Length);
             Assert.AreEqual(MANAGER_ID_1, loadedSettings.EstateManagers[0]);
@@ -196,7 +196,7 @@ namespace OpenSim.Data.Tests
         public void T021_EstateSettingsUserList()
         {
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
             originalSettings.EstateAccess = new UUID[] { USER_ID_1, USER_ID_2 };
 
@@ -204,7 +204,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID, true);
 
             Assert.AreEqual(2, loadedSettings.EstateAccess.Length);
             Assert.AreEqual(USER_ID_1, loadedSettings.EstateAccess[0]);
@@ -215,7 +215,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsGroupList()
         {
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
             originalSettings.EstateGroups = new UUID[] { GROUP_ID_1, GROUP_ID_2 };
 
@@ -223,7 +223,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID, true);
 
             Assert.AreEqual(2, loadedSettings.EstateAccess.Length);
             Assert.AreEqual(GROUP_ID_1, loadedSettings.EstateGroups[0]);
@@ -234,7 +234,7 @@ namespace OpenSim.Data.Tests
         public void T022_EstateSettingsBanList()
         {
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
 
             EstateBan estateBan1 = new EstateBan();
             estateBan1.BannedUserID = DataTestUtil.UUID_MIN;
@@ -248,7 +248,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID, true);
 
             Assert.AreEqual(2, loadedSettings.EstateBans.Length);
             Assert.AreEqual(DataTestUtil.UUID_MIN, loadedSettings.EstateBans[0].BannedUserID);
@@ -290,7 +290,7 @@ namespace OpenSim.Data.Tests
         {
 
             // Letting estate store generate rows to database for us
-            EstateSettings originalSettings = db.LoadEstateSettings(regionId);
+            EstateSettings originalSettings = db.LoadEstateSettings(regionId, true);
 
             SetEstateSettings(
                 originalSettings,
@@ -347,7 +347,7 @@ namespace OpenSim.Data.Tests
             db.StoreEstateSettings(originalSettings);
 
             // Loading settings to another instance variable.
-            EstateSettings loadedSettings = db.LoadEstateSettings(regionId);
+            EstateSettings loadedSettings = db.LoadEstateSettings(regionId, true);
 
             // Checking that loaded values are correct.
             ValidateEstateSettings(
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
deleted file mode 100644
index df6c669..0000000
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-
-namespace OpenSim.Data.Tests
-{
-    public class BasicGridTest
-    {
-        public IGridDataPlugin db;
-        public UUID region1, region2, region3;
-        public UUID zero = UUID.Zero;
-        public static Random random = new Random();
-
-        [TearDown]
-        public void removeAllRegions()
-        {
-            // Clean up all the regions.
-            List<RegionProfileData> regions = db.GetRegionsByName("", 100);
-            if (regions != null)
-            {
-                foreach (RegionProfileData region in regions)
-                {
-                    db.DeleteProfile(region.Uuid.ToString());
-                }
-            }
-        }
-
-        public void SuperInit()
-        {
-            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            region1 = UUID.Random();
-            region2 = UUID.Random();
-            region3 = UUID.Random();
-        }
-
-        protected RegionProfileData createRegion(UUID regionUUID, string regionName)
-        {
-            RegionProfileData reg = new RegionProfileData();
-            new PropertyScrambler<RegionProfileData>().Scramble(reg);
-            reg.Uuid = regionUUID;
-            reg.RegionName = regionName;
-
-            db.StoreProfile(reg);
-
-            return reg;
-        }
-
-        [Test]
-        public void T001_LoadEmpty()
-        {
-            Assert.That(db.GetProfileByUUID(region1),Is.Null);
-            Assert.That(db.GetProfileByUUID(region2),Is.Null);
-            Assert.That(db.GetProfileByUUID(region3),Is.Null);
-            Assert.That(db.GetProfileByUUID(zero),Is.Null);
-        }
-
-        [Test]
-        public void T011_AddRetrieveCompleteTest()
-        {
-            RegionProfileData newreg = createRegion(region2, "|<Goth@m Ci1y>|");
-            RegionProfileData retreg = db.GetProfileByUUID(region2);
-
-            Assert.That(retreg, Constraints.PropertyCompareConstraint(newreg).IgnoreProperty(x => x.RegionOnline));
-
-            retreg = db.GetProfileByHandle(newreg.RegionHandle);
-            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
-
-            retreg = db.GetProfileByString(newreg.RegionName);
-            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
-
-            RegionProfileData[] retregs = db.GetProfilesInRange(newreg.RegionLocX,newreg.RegionLocY,newreg.RegionLocX,newreg.RegionLocY);
-            Assert.That(retregs[0].Uuid, Is.EqualTo(region2), "Assert.That(retregs[0].Uuid, Is.EqualTo(region2))");
-        }
-
-        [Test]
-        public void T012_DeleteProfile()
-        {
-            createRegion(region1, "doesn't matter");
-
-            db.DeleteProfile(region1.ToString());
-            RegionProfileData retreg = db.GetProfileByUUID(region1);
-            Assert.That(retreg,Is.Null);
-        }
-
-        [Test]
-        public void T013_UpdateProfile()
-        {
-            createRegion(region2, "|<Goth@m Ci1y>|");
-
-            RegionProfileData retreg = db.GetProfileByUUID(region2);
-            retreg.regionName = "Gotham City";
-
-            db.StoreProfile(retreg);
-
-            retreg = db.GetProfileByUUID(region2);
-            Assert.That(retreg.RegionName, Is.EqualTo("Gotham City"), "Assert.That(retreg.RegionName, Is.EqualTo(\"Gotham City\"))");
-        }
-
-        [Test]
-        public void T014_RegionList()
-        {
-            createRegion(region2, "Gotham City");
-
-            RegionProfileData retreg = db.GetProfileByUUID(region2);
-            retreg.RegionName = "Gotham Town";
-            retreg.Uuid = region1;
-
-            db.StoreProfile(retreg);
-
-            retreg = db.GetProfileByUUID(region2);
-            retreg.RegionName = "Gothan Town";
-            retreg.Uuid = region3;
-
-            db.StoreProfile(retreg);
-
-            List<RegionProfileData> listreg = db.GetRegionsByName("Gotham",10);
-
-            Assert.That(listreg.Count,Is.EqualTo(2), "Assert.That(listreg.Count,Is.EqualTo(2))");
-            Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid), "Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid))");
-            Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
-            Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
-        }
-
-        [Test]
-        public void T999_StillNull()
-        {
-            Assert.That(db.GetProfileByUUID(zero), Is.Null);
-        }
-
-        protected static string RandomName()
-        {
-            StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12);
-            char ch ;
-            for (int i=0; i<size; i++)
-            {
-                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
-                name.Append(ch);
-            }
-            return name.ToString();
-        }
-    }
-}
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
deleted file mode 100644
index d3b6041..0000000
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// TODO: Money Transfer, Inventory Transfer and UpdateUserRegion once they exist
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using log4net.Config;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-using OpenSim.Framework;
-using log4net;
-using System.Reflection;
-
-namespace OpenSim.Data.Tests
-{
-    public class BasicUserTest
-    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public IUserDataPlugin db;
-        public UUID user1;
-        public UUID user2;
-        public UUID user3;
-        public UUID user4;
-        public UUID user5;
-        public UUID webkey;
-        public UUID zero = UUID.Zero;
-        public static Random random;
-
-        public UUID agent1;
-        public UUID agent2;
-        public UUID agent3;
-        public UUID agent4;
-        
-        public UUID region1;
-        
-        public string fname0;
-        public string lname0;
-        public string fname1;
-        public string lname1;
-        public string fname2;
-        public string lname2;
-        public string fname3;
-        public string lname3;
-
-        public void SuperInit()
-        {
-            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            random = new Random();
-            user1 = UUID.Random();
-            user2 = UUID.Random();
-            user3 = UUID.Random();
-            user4 = UUID.Random();
-            user5 = UUID.Random();
-            agent1 = UUID.Random();
-            agent2 = UUID.Random();
-            agent3 = UUID.Random();
-            agent4 = UUID.Random();
-            webkey = UUID.Random();
-            region1 = UUID.Random();
-            fname0 = RandomName();
-            lname0 = RandomName();
-            fname1 = RandomName();
-            lname1 = RandomName();
-            fname2 = RandomName();
-            lname2 = RandomName();
-            fname3 = RandomName();
-            lname3 = RandomName();
-        }
-
-        [Test]
-        public void T001_LoadEmpty()
-        {
-            Assert.That(db.GetUserByUUID(zero), Is.Null);
-            Assert.That(db.GetUserByUUID(user1), Is.Null);
-            Assert.That(db.GetUserByUUID(user2), Is.Null);
-            Assert.That(db.GetUserByUUID(user3), Is.Null);
-            Assert.That(db.GetUserByUUID(UUID.Random()), Is.Null);
-
-            Assert.That(db.GetAgentByUUID(zero), Is.Null);
-            Assert.That(db.GetAgentByUUID(agent1), Is.Null);
-            Assert.That(db.GetAgentByUUID(agent2), Is.Null);
-            Assert.That(db.GetAgentByUUID(agent3), Is.Null);
-            Assert.That(db.GetAgentByUUID(UUID.Random()), Is.Null);
-        }
-
-        [Test]
-        public void T010_CreateUser()
-        {
-            UserProfileData u1 = NewUser(user1,fname1,lname1);
-            UserProfileData u2 = NewUser(user2,fname2,lname2);
-            UserProfileData u3 = NewUser(user3,fname3,lname3);
-            // this is used to check whether null works here
-            u3.Email = null;
-
-            db.AddNewUserProfile(u1);
-            db.AddNewUserProfile(u2);
-            db.AddNewUserProfile(u3);
-            UserProfileData u1a = db.GetUserByUUID(user1);
-            UserProfileData u2a = db.GetUserByUUID(user2);
-            UserProfileData u3a = db.GetUserByUUID(user3);
-            Assert.That(user1,Is.EqualTo(u1a.ID), "Assert.That(user1,Is.EqualTo(u1a.ID))");
-            Assert.That(user2,Is.EqualTo(u2a.ID), "Assert.That(user2,Is.EqualTo(u2a.ID))");
-            Assert.That(user3,Is.EqualTo(u3a.ID), "Assert.That(user3,Is.EqualTo(u3a.ID))");
-
-            // and one email test
-            Assert.That(u3.Email, Is.Null);
-        }
-        
-        [Test]
-        public void T011_FetchUserByName()
-        {
-            UserProfileData u1 = db.GetUserByName(fname1,lname1);
-            UserProfileData u2 = db.GetUserByName(fname2,lname2);
-            UserProfileData u3 = db.GetUserByName(fname3,lname3);
-            Assert.That(user1,Is.EqualTo(u1.ID), "Assert.That(user1,Is.EqualTo(u1.ID))");
-            Assert.That(user2,Is.EqualTo(u2.ID), "Assert.That(user2,Is.EqualTo(u2.ID))");
-            Assert.That(user3,Is.EqualTo(u3.ID), "Assert.That(user3,Is.EqualTo(u3.ID))");
-        }
-
-        [Test]
-        public void T012_UpdateUserProfile()
-        {
-            UserProfileData u1 = db.GetUserByUUID(user1);
-            Assert.That(fname1,Is.EqualTo(u1.FirstName), "Assert.That(fname1,Is.EqualTo(u1.FirstName))");
-            u1.FirstName = "Ugly";
-            
-            db.UpdateUserProfile(u1);
-            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");
-        }
-
-        [Test]
-        public void T013_StoreUserWebKey()
-        {
-            UserProfileData u1 = db.GetUserByUUID(user1);
-            Assert.That(u1.WebLoginKey,Is.EqualTo(zero), "Assert.That(u1.WebLoginKey,Is.EqualTo(zero))");
-            db.StoreWebLoginKey(user1, webkey);
-            u1 = db.GetUserByUUID(user1);
-            Assert.That(u1.WebLoginKey,Is.EqualTo(webkey), "Assert.That(u1.WebLoginKey,Is.EqualTo(webkey))");
-        }
-        
-        [Test]
-        public void T014_ExpectedNullReferenceReturns()
-        {
-            UserProfileData u0 = NewUser(zero,fname0,lname0); 
-            UserProfileData u4 = NewUser(user4,fname2,lname2);
-            db.AddNewUserProfile(u0); //UserID 0 should fail to save.
-            db.AddNewUserProfile(u4); //The first name and last name are already in use (from T010), so this should fail too
-            Assert.That(db.GetUserByUUID(zero),Is.Null);
-            Assert.That(db.GetUserByUUID(user4),Is.Null);
-        }
-        
-        [Test]
-        public void T015_UserPersistency()
-        {
-            UserProfileData u = new UserProfileData();
-            UUID id = user5;
-            string fname = RandomName();
-            string lname = RandomName();
-            string email = RandomName();
-            string passhash =  RandomName();
-            string passsalt =  RandomName();
-            UUID homeregion = UUID.Random();
-            UUID webloginkey = UUID.Random();
-            uint homeregx = (uint) random.Next();
-            uint homeregy = (uint) random.Next();
-            Vector3 homeloc 
-                = new Vector3(
-                    (float)Math.Round(random.NextDouble(), 5),
-                    (float)Math.Round(random.NextDouble(), 5),
-                    (float)Math.Round(random.NextDouble(), 5));
-            Vector3 homelookat 
-                = new Vector3(
-                    (float)Math.Round(random.NextDouble(), 5),
-                    (float)Math.Round(random.NextDouble(), 5),
-                    (float)Math.Round(random.NextDouble(), 5));
-            int created = random.Next();
-            int lastlogin = random.Next();
-            string userinvuri = RandomName();
-            string userasseturi = RandomName();
-            uint candomask = (uint) random.Next();
-            uint wantdomask = (uint) random.Next();
-            string abouttext = RandomName();
-            string flabouttext = RandomName();
-            UUID image = UUID.Random();
-            UUID firstimage = UUID.Random();
-            UserAgentData agent = NewAgent(id,UUID.Random());
-            int userflags = random.Next();
-            int godlevel = random.Next();
-            string customtype = RandomName();
-            UUID partner = UUID.Random();
-            
-            //HomeRegionX and HomeRegionY must only use 24 bits
-            homeregx = ((homeregx << 8) >> 8);
-            homeregy = ((homeregy << 8) >> 8);
-
-            u.ID = id;
-            u.WebLoginKey = webloginkey;
-            u.HomeRegionID = homeregion;
-            u.FirstName = fname;
-            u.SurName = lname;
-            u.Email = email;
-            u.PasswordHash = passhash;
-            u.PasswordSalt = passsalt;
-            u.HomeRegionX = homeregx;
-            u.HomeRegionY = homeregy;
-            ulong homereg = u.HomeRegion;
-            u.HomeLocation = homeloc;
-            u.HomeLookAt = homelookat;
-            u.Created = created;
-            u.LastLogin = lastlogin;
-            u.UserInventoryURI = userinvuri;
-            u.UserAssetURI = userasseturi;
-            u.CanDoMask = candomask;
-            u.WantDoMask = wantdomask;
-            u.AboutText = abouttext;
-            u.FirstLifeAboutText = flabouttext;
-            u.Image = image;
-            u.FirstLifeImage = firstimage;
-            u.CurrentAgent = agent;
-            u.UserFlags = userflags;
-            u.GodLevel = godlevel;
-            u.CustomType = customtype;
-            u.Partner = partner;
-            
-            db.AddNewUserProfile(u);
-            UserProfileData u1a = db.GetUserByUUID(id);
-            Assert.That(u1a,Is.Not.Null);
-            Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
-            Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID))");
-            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
-            Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
-            Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
-            Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
-            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
-            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
-            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
-            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
-            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
-            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
-            Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
-            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
-            Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI), "Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI))");
-            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
-            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
-            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
-            Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
-            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
-            Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
-            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
-            Assert.That(u1a.CurrentAgent,Is.Null);
-            Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
-            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
-            Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
-            Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
-        }
-
-        [Test]
-        public void T016_UserUpdatePersistency()
-        {
-            UUID id = user5;
-            UserProfileData u = db.GetUserByUUID(id);
-            string fname = RandomName();
-            string lname = RandomName();
-            string email = RandomName();
-            string passhash =  RandomName();
-            string passsalt =  RandomName();
-            UUID homeregionid = UUID.Random();
-            UUID webloginkey = UUID.Random();
-            uint homeregx = (uint) random.Next();
-            uint homeregy = (uint) random.Next();
-            Vector3 homeloc = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            Vector3 homelookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            int created = random.Next();
-            int lastlogin = random.Next();
-            string userinvuri = RandomName();
-            string userasseturi = RandomName();
-            uint candomask = (uint) random.Next();
-            uint wantdomask = (uint) random.Next();
-            string abouttext = RandomName();
-            string flabouttext = RandomName();
-            UUID image = UUID.Random();
-            UUID firstimage = UUID.Random();
-            UserAgentData agent = NewAgent(id,UUID.Random());
-            int userflags = random.Next();
-            int godlevel = random.Next();
-            string customtype = RandomName();
-            UUID partner = UUID.Random();
-            
-            //HomeRegionX and HomeRegionY must only use 24 bits
-            homeregx = ((homeregx << 8) >> 8);
-            homeregy = ((homeregy << 8) >> 8);
-       
-            u.WebLoginKey = webloginkey;
-            u.HomeRegionID = homeregionid;
-            u.FirstName = fname;
-            u.SurName = lname;
-            u.Email = email;
-            u.PasswordHash = passhash;
-            u.PasswordSalt = passsalt;
-            u.HomeRegionX = homeregx;
-            u.HomeRegionY = homeregy;
-            ulong homereg = u.HomeRegion;
-            u.HomeLocation = homeloc;
-            u.HomeLookAt = homelookat;
-            u.Created = created;
-            u.LastLogin = lastlogin;
-            u.UserInventoryURI = userinvuri;
-            u.UserAssetURI = userasseturi;
-            u.CanDoMask = candomask;
-            u.WantDoMask = wantdomask;
-            u.AboutText = abouttext;
-            u.FirstLifeAboutText = flabouttext;
-            u.Image = image;
-            u.FirstLifeImage = firstimage;
-            u.CurrentAgent = agent;
-            u.UserFlags = userflags;
-            u.GodLevel = godlevel;
-            u.CustomType = customtype;
-            u.Partner = partner;
-            
-            db.UpdateUserProfile(u);
-            UserProfileData u1a = db.GetUserByUUID(id);
-            Assert.That(u1a,Is.Not.Null);
-            Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
-            Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID))");
-            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
-            Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
-            Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
-            Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
-            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
-            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
-            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
-            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
-            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
-            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
-            Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
-            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
-            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
-            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
-            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
-            Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
-            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
-            Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
-            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
-            Assert.That(u1a.CurrentAgent,Is.Null);
-            Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
-            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
-            Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
-            Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
-        }
-
-        [Test]
-        public void T017_UserUpdateRandomPersistency()
-        {
-            UUID id = user5;
-            UserProfileData u = db.GetUserByUUID(id);
-            new PropertyScrambler<UserProfileData>().DontScramble(x=>x.ID).Scramble(u);
-            
-            db.UpdateUserProfile(u);
-            UserProfileData u1a = db.GetUserByUUID(id);
-            Assert.That(u1a, Constraints.PropertyCompareConstraint(u)
-                .IgnoreProperty(x=>x.HomeRegionX)
-                .IgnoreProperty(x=>x.HomeRegionY)
-                );
-        }
-        
-        [Test]
-        public void T020_CreateAgent()
-        {
-            UserAgentData a1 = NewAgent(user1,agent1);
-            UserAgentData a2 = NewAgent(user2,agent2);
-            UserAgentData a3 = NewAgent(user3,agent3);
-            db.AddNewUserAgent(a1);
-            db.AddNewUserAgent(a2);
-            db.AddNewUserAgent(a3);
-            UserAgentData a1a = db.GetAgentByUUID(user1);
-            UserAgentData a2a = db.GetAgentByUUID(user2);
-            UserAgentData a3a = db.GetAgentByUUID(user3);
-            Assert.That(agent1,Is.EqualTo(a1a.SessionID), "Assert.That(agent1,Is.EqualTo(a1a.SessionID))");
-            Assert.That(user1,Is.EqualTo(a1a.ProfileID), "Assert.That(user1,Is.EqualTo(a1a.ProfileID))");
-            Assert.That(agent2,Is.EqualTo(a2a.SessionID), "Assert.That(agent2,Is.EqualTo(a2a.SessionID))");
-            Assert.That(user2,Is.EqualTo(a2a.ProfileID), "Assert.That(user2,Is.EqualTo(a2a.ProfileID))");
-            Assert.That(agent3,Is.EqualTo(a3a.SessionID), "Assert.That(agent3,Is.EqualTo(a3a.SessionID))");
-            Assert.That(user3,Is.EqualTo(a3a.ProfileID), "Assert.That(user3,Is.EqualTo(a3a.ProfileID))");
-        }
-        
-        [Test]
-        public void T021_FetchAgentByName()
-        {
-            String name3 = fname3 + " " + lname3;
-            UserAgentData a2 = db.GetAgentByName(fname2,lname2);
-            UserAgentData a3 = db.GetAgentByName(name3);
-            Assert.That(user2,Is.EqualTo(a2.ProfileID), "Assert.That(user2,Is.EqualTo(a2.ProfileID))");
-            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");
-        }
-        
-        [Test]
-        public void T022_ExceptionalCases()
-        {
-            UserAgentData a0 = NewAgent(user4,zero);
-            UserAgentData a4 = NewAgent(zero,agent4);
-            db.AddNewUserAgent(a0);
-            db.AddNewUserAgent(a4);
-
-            Assert.That(db.GetAgentByUUID(user4),Is.Null);
-            Assert.That(db.GetAgentByUUID(zero),Is.Null);
-        }
-        
-        [Test]
-        public void T023_AgentPersistency()
-        {
-            UUID user = user4;
-            UUID agent = agent4;
-            UUID secureagent = UUID.Random();
-            string agentip = RandomName();
-            uint agentport = (uint)random.Next();
-            bool agentonline = (random.NextDouble() > 0.5);
-            int logintime = random.Next();
-            int logouttime = random.Next();
-            UUID regionid = UUID.Random();
-            ulong regionhandle = (ulong) random.Next();
-            Vector3 currentpos = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            Vector3 currentlookat = new Vector3((float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5),(float)Math.Round(random.NextDouble(),5));
-            UUID orgregionid = UUID.Random();
-            
-            UserAgentData a = new UserAgentData();
-            a.ProfileID = user;
-            a.SessionID = agent;
-            a.SecureSessionID = secureagent;
-            a.AgentIP = agentip;
-            a.AgentPort = agentport;
-            a.AgentOnline = agentonline;
-            a.LoginTime = logintime;
-            a.LogoutTime = logouttime;
-            a.Region = regionid;
-            a.Handle = regionhandle;
-            a.Position = currentpos;
-            a.LookAt = currentlookat;
-            a.InitialRegion = orgregionid;
-
-            db.AddNewUserAgent(a);
-
-            UserAgentData a1 = db.GetAgentByUUID(user4);
-            Assert.That(user,Is.EqualTo(a1.ProfileID), "Assert.That(user,Is.EqualTo(a1.ProfileID))");
-            Assert.That(agent,Is.EqualTo(a1.SessionID), "Assert.That(agent,Is.EqualTo(a1.SessionID))");
-            Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID), "Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID))");
-            Assert.That(agentip,Is.EqualTo(a1.AgentIP), "Assert.That(agentip,Is.EqualTo(a1.AgentIP))");
-            Assert.That(agentport,Is.EqualTo(a1.AgentPort), "Assert.That(agentport,Is.EqualTo(a1.AgentPort))");
-            Assert.That(agentonline,Is.EqualTo(a1.AgentOnline), "Assert.That(agentonline,Is.EqualTo(a1.AgentOnline))");
-            Assert.That(logintime,Is.EqualTo(a1.LoginTime), "Assert.That(logintime,Is.EqualTo(a1.LoginTime))");
-            Assert.That(logouttime,Is.EqualTo(a1.LogoutTime), "Assert.That(logouttime,Is.EqualTo(a1.LogoutTime))");
-            Assert.That(regionid,Is.EqualTo(a1.Region), "Assert.That(regionid,Is.EqualTo(a1.Region))");
-            Assert.That(regionhandle,Is.EqualTo(a1.Handle), "Assert.That(regionhandle,Is.EqualTo(a1.Handle))");
-            Assert.That(currentpos,Is.EqualTo(a1.Position), "Assert.That(currentpos,Is.EqualTo(a1.Position))");
-            Assert.That(currentlookat,Is.EqualTo(a1.LookAt), "Assert.That(currentlookat,Is.EqualTo(a1.LookAt))");
-        }
-
-        [Test]
-        public void T030_CreateFriendList()
-        {
-            Dictionary<UUID, uint> perms = new Dictionary<UUID,uint>();
-            Dictionary<UUID, int> friends = new Dictionary<UUID,int>();
-            uint temp;
-            int tempu1, tempu2;
-            db.AddNewUserFriend(user1,user2, 1);
-            db.AddNewUserFriend(user1,user3, 2);
-            db.AddNewUserFriend(user1,user2, 4); 
-            List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
-            perms.Add(user2,1);
-            perms.Add(user3,2);
-            for (int i = 0; i < fl1.Count; i++)
-            {
-                Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner), "Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner))");
-                friends.Add(fl1[i].Friend,1);
-                temp = perms[fl1[i].Friend];
-                Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms), "Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms))");
-            }
-            tempu1 = friends[user2];
-            tempu2 = friends[user3];
-            Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2), "Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2))");
-        }
-        
-        [Test]
-        public void T031_RemoveUserFriend()
-        // user1 has 2 friends, user2 and user3.
-        {
-            List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            List<FriendListItem> fl2 = db.GetUserFriendList(user2);
-
-            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
-            Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3), "Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3))");
-            Assert.That(fl2[0].Friend,Is.EqualTo(user1), "Assert.That(fl2[0].Friend,Is.EqualTo(user1))");
-            db.RemoveUserFriend(user2, user1);
-            
-            fl1 = db.GetUserFriendList(user1);
-            fl2 = db.GetUserFriendList(user2);
-            Assert.That(fl1.Count,Is.EqualTo(1), "Assert.That(fl1.Count,Is.EqualTo(1))");
-            Assert.That(fl1[0].Friend, Is.EqualTo(user3), "Assert.That(fl1[0].Friend, Is.EqualTo(user3))");
-            Assert.That(fl2, Is.Empty);
-        }
-        
-        [Test]
-        public void T032_UpdateFriendPerms()
-        // user1 has 1 friend, user3, who has permission 2 in T030.
-        {
-            List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(2), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(2))");
-            db.UpdateUserFriendPerms(user1, user3, 4);
-            
-            fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");
-        }
-        
-        [Test]
-        public void T040_UserAppearance()
-        {
-            AvatarAppearance appear = new AvatarAppearance();
-            appear.Owner = user1;
-            db.UpdateUserAppearance(user1, appear);
-            AvatarAppearance user1app = db.GetUserAppearance(user1);
-            Assert.That(user1,Is.EqualTo(user1app.Owner), "Assert.That(user1,Is.EqualTo(user1app.Owner))");
-        }
-        
-        [Test]
-        public void T041_UserAppearancePersistency()
-        {
-            AvatarAppearance appear = new AvatarAppearance();
-            UUID owner = UUID.Random();
-            int serial = random.Next();
-            byte[] visualp = new byte[218];
-            random.NextBytes(visualp);
-            UUID bodyitem = UUID.Random();
-            UUID bodyasset = UUID.Random();
-            UUID skinitem = UUID.Random();
-            UUID skinasset = UUID.Random();
-            UUID hairitem = UUID.Random();
-            UUID hairasset = UUID.Random();
-            UUID eyesitem = UUID.Random();
-            UUID eyesasset = UUID.Random();
-            UUID shirtitem = UUID.Random();
-            UUID shirtasset = UUID.Random();
-            UUID pantsitem = UUID.Random();
-            UUID pantsasset = UUID.Random();
-            UUID shoesitem = UUID.Random();
-            UUID shoesasset = UUID.Random();
-            UUID socksitem = UUID.Random();
-            UUID socksasset = UUID.Random();
-            UUID jacketitem = UUID.Random();
-            UUID jacketasset = UUID.Random();
-            UUID glovesitem = UUID.Random();
-            UUID glovesasset = UUID.Random();
-            UUID ushirtitem = UUID.Random();
-            UUID ushirtasset = UUID.Random();
-            UUID upantsitem = UUID.Random();
-            UUID upantsasset = UUID.Random();
-            UUID skirtitem = UUID.Random();
-            UUID skirtasset = UUID.Random();
-            Primitive.TextureEntry texture = AvatarAppearance.GetDefaultTexture();
-            float avatarheight = (float) (Math.Round(random.NextDouble(),5));
-            
-            appear.Owner = owner;
-            appear.Serial = serial;
-            appear.VisualParams = visualp;
-            appear.BodyItem = bodyitem;
-            appear.BodyAsset = bodyasset;
-            appear.SkinItem = skinitem;
-            appear.SkinAsset = skinasset;
-            appear.HairItem = hairitem;
-            appear.HairAsset = hairasset;
-            appear.EyesItem = eyesitem;
-            appear.EyesAsset = eyesasset;
-            appear.ShirtItem = shirtitem;
-            appear.ShirtAsset = shirtasset;
-            appear.PantsItem = pantsitem;
-            appear.PantsAsset = pantsasset;
-            appear.ShoesItem = shoesitem;
-            appear.ShoesAsset = shoesasset;
-            appear.SocksItem = socksitem;
-            appear.SocksAsset = socksasset;
-            appear.JacketItem = jacketitem;
-            appear.JacketAsset = jacketasset;
-            appear.GlovesItem = glovesitem;
-            appear.GlovesAsset = glovesasset;
-            appear.UnderShirtItem = ushirtitem;
-            appear.UnderShirtAsset = ushirtasset;
-            appear.UnderPantsItem = upantsitem;
-            appear.UnderPantsAsset = upantsasset;
-            appear.SkirtItem = skirtitem;
-            appear.SkirtAsset = skirtasset;
-            appear.Texture = texture;
-            appear.AvatarHeight = avatarheight;
-            
-            db.UpdateUserAppearance(owner, appear);
-            AvatarAppearance app = db.GetUserAppearance(owner);
-
-            Assert.That(owner,Is.EqualTo(app.Owner), "Assert.That(owner,Is.EqualTo(app.Owner))");
-            Assert.That(serial,Is.EqualTo(app.Serial), "Assert.That(serial,Is.EqualTo(app.Serial))");
-            Assert.That(visualp,Is.EqualTo(app.VisualParams), "Assert.That(visualp,Is.EqualTo(app.VisualParams))");
-            Assert.That(bodyitem,Is.EqualTo(app.BodyItem), "Assert.That(bodyitem,Is.EqualTo(app.BodyItem))");
-            Assert.That(bodyasset,Is.EqualTo(app.BodyAsset), "Assert.That(bodyasset,Is.EqualTo(app.BodyAsset))");
-            Assert.That(skinitem,Is.EqualTo(app.SkinItem), "Assert.That(skinitem,Is.EqualTo(app.SkinItem))");
-            Assert.That(skinasset,Is.EqualTo(app.SkinAsset), "Assert.That(skinasset,Is.EqualTo(app.SkinAsset))");
-            Assert.That(hairitem,Is.EqualTo(app.HairItem), "Assert.That(hairitem,Is.EqualTo(app.HairItem))");
-            Assert.That(hairasset,Is.EqualTo(app.HairAsset), "Assert.That(hairasset,Is.EqualTo(app.HairAsset))");
-            Assert.That(eyesitem,Is.EqualTo(app.EyesItem), "Assert.That(eyesitem,Is.EqualTo(app.EyesItem))");
-            Assert.That(eyesasset,Is.EqualTo(app.EyesAsset), "Assert.That(eyesasset,Is.EqualTo(app.EyesAsset))");
-            Assert.That(shirtitem,Is.EqualTo(app.ShirtItem), "Assert.That(shirtitem,Is.EqualTo(app.ShirtItem))");
-            Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset), "Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset))");
-            Assert.That(pantsitem,Is.EqualTo(app.PantsItem), "Assert.That(pantsitem,Is.EqualTo(app.PantsItem))");
-            Assert.That(pantsasset,Is.EqualTo(app.PantsAsset), "Assert.That(pantsasset,Is.EqualTo(app.PantsAsset))");
-            Assert.That(shoesitem,Is.EqualTo(app.ShoesItem), "Assert.That(shoesitem,Is.EqualTo(app.ShoesItem))");
-            Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset), "Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset))");
-            Assert.That(socksitem,Is.EqualTo(app.SocksItem), "Assert.That(socksitem,Is.EqualTo(app.SocksItem))");
-            Assert.That(socksasset,Is.EqualTo(app.SocksAsset), "Assert.That(socksasset,Is.EqualTo(app.SocksAsset))");
-            Assert.That(jacketitem,Is.EqualTo(app.JacketItem), "Assert.That(jacketitem,Is.EqualTo(app.JacketItem))");
-            Assert.That(jacketasset,Is.EqualTo(app.JacketAsset), "Assert.That(jacketasset,Is.EqualTo(app.JacketAsset))");
-            Assert.That(glovesitem,Is.EqualTo(app.GlovesItem), "Assert.That(glovesitem,Is.EqualTo(app.GlovesItem))");
-            Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset), "Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset))");
-            Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem), "Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem))");
-            Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset), "Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset))");
-            Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem), "Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem))");
-            Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset), "Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset))");
-            Assert.That(skirtitem,Is.EqualTo(app.SkirtItem), "Assert.That(skirtitem,Is.EqualTo(app.SkirtItem))");
-            Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset), "Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset))");
-            Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()), "Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()))");
-            Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight), "Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight))");
-        }
-
-        [Test]
-        public void T999_StillNull()
-        {
-            Assert.That(db.GetUserByUUID(zero), Is.Null);
-            Assert.That(db.GetAgentByUUID(zero), Is.Null);
-        }
-
-        public UserProfileData NewUser(UUID id,string fname,string lname)
-        {
-            UserProfileData u = new UserProfileData();
-            u.ID = id;
-            u.FirstName = fname;
-            u.SurName = lname;
-            u.PasswordHash = "NOTAHASH";
-            u.PasswordSalt = "NOTSALT";
-            // MUST specify at least these 5 parameters or an exception is raised
-
-            return u;
-        }
-        
-        public UserAgentData NewAgent(UUID user_profile, UUID agent)
-        {
-            UserAgentData a = new UserAgentData();
-            a.ProfileID = user_profile;
-            a.SessionID = agent;
-            a.SecureSessionID = UUID.Random();
-            a.AgentIP = RandomName();
-            return a;
-        }
-        
-        public static string RandomName()
-        {
-            StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12); 
-            char ch ;
-            for (int i=0; i<size; i++)
-            {
-                ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ;
-                name.Append(ch);
-            }
-            return name.ToString();
-        }
-    }
-}
diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
index 5b1f935..f3d41df 100644
--- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs
+++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
@@ -297,8 +297,8 @@ namespace OpenSim.Data.Tests
         public void AssetShouldMatch()
         {
             UUID uuid1 = UUID.Random();
-            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture);
-            AssetBase expected = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture);
+            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
+            AssetBase expected = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
 
             var constraint = Constraints.PropertyCompareConstraint(expected);
 
@@ -309,8 +309,8 @@ namespace OpenSim.Data.Tests
         public void AssetShouldNotMatch()
         {
             UUID uuid1 = UUID.Random();
-            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture);
-            AssetBase expected = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture);
+            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
+            AssetBase expected = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
 
             var constraint = Constraints.PropertyCompareConstraint(expected);
 
@@ -321,8 +321,8 @@ namespace OpenSim.Data.Tests
         public void AssetShouldNotMatch2()
         {
             UUID uuid1 = UUID.Random();
-            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture);
-            AssetBase expected = new AssetBase(uuid1, "asset two", (sbyte)AssetType.Texture);
+            AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
+            AssetBase expected = new AssetBase(uuid1, "asset two", (sbyte)AssetType.Texture, UUID.Zero.ToString());
 
             var constraint = Constraints.PropertyCompareConstraint(expected);
 
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs
index c968364..132294a 100644
--- a/OpenSim/Data/Tests/PropertyScrambler.cs
+++ b/OpenSim/Data/Tests/PropertyScrambler.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void TestScramble()
         {
-            AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture);
+            AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString());
             new PropertyScrambler<AssetBase>().Scramble(actual);
         }
 
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
         public void DontScramble()
         {
             UUID uuid = UUID.Random();
-            AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture);
+            AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture, UUID.Zero.ToString());
             new PropertyScrambler<AssetBase>()
                 .DontScramble(x => x.Metadata)
                 .DontScramble(x => x.FullID)
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
deleted file mode 100644
index 3d370da..0000000
--- a/OpenSim/Data/UserDataBase.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data
-{
-    public abstract class UserDataBase : IUserDataPlugin
-    {
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        // private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
-
-        public abstract UserProfileData GetUserByUUID(UUID user);
-        public abstract UserProfileData GetUserByName(string fname, string lname);
-        public abstract UserAgentData GetAgentByUUID(UUID user);
-        public abstract UserAgentData GetAgentByName(string name);
-        public abstract UserAgentData GetAgentByName(string fname, string lname);
-        public UserProfileData GetUserByUri(Uri uri) { return null; }
-        public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
-        public abstract void AddNewUserProfile(UserProfileData user);
-        
-        public virtual void AddTemporaryUserProfile(UserProfileData userProfile)
-        {
-            // Deliberately blank - database plugins shouldn't store temporary profiles.
-        }
-        
-        public abstract bool UpdateUserProfile(UserProfileData user);
-        public abstract void AddNewUserAgent(UserAgentData agent);
-        public abstract void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms);
-        public abstract void RemoveUserFriend(UUID friendlistowner, UUID friend);
-        public abstract void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms);
-        public abstract List<FriendListItem> GetUserFriendList(UUID friendlistowner);
-        public abstract Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids);
-        public abstract bool MoneyTransferRequest(UUID from, UUID to, uint amount);
-        public abstract bool InventoryTransferRequest(UUID from, UUID to, UUID inventory);
-        public abstract List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query);
-        public abstract AvatarAppearance GetUserAppearance(UUID user);
-        public abstract void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
-        // public virtual AvatarAppearance GetUserAppearance(UUID user) {
-        //     AvatarAppearance aa = null;
-        //     try {
-        //         aa = aplist[user];
-        //         m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
-        //     } catch (System.Collections.Generic.KeyNotFoundException e) {
-        //         m_log.Info("[APPEARANCE] No appearance found for " + user.ToString());
-        //     }
-        //     return aa;
-        // }
-        // public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance) {
-        //     aplist[user] = appearance;
-        //     m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
-        // }
-        public abstract void ResetAttachments(UUID userID);
-
-        public abstract void LogoutUsers(UUID regionID);
-
-        public abstract string Version {get;}
-        public abstract string Name {get;}
-        public abstract void Initialise(string connect);
-        public abstract void Initialise();
-        public abstract void Dispose();
-   }
-}