1 files changed, 829 insertions, 531 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 9118012..6352cce 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
@@ -41,6 +42,8 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLUserData : UserDataBase
     {
+        private const string _migrationStore = "UserStore";
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
@@ -52,28 +55,35 @@ namespace OpenSim.Data.MSSQL
         private string m_usersTableName;
         private string m_userFriendsTableName;
 
-        public override void Initialise()
+        override public void Initialise()
         {
             m_log.Info("[MSSQLUserData]: " + Name + " cannot be default-initialized!");
-            throw new PluginNotInitialisedException (Name);
+            throw new PluginNotInitialisedException(Name);
         }
 
         /// <summary>
         /// Loads and initialises the MSSQL storage plugin
         /// </summary>
-        /// <param name="connect">TODO: do something with the connect string instead of ignoring it.</param>
+        /// <param name="connect">connectionstring</param>
         /// <remarks>use mssql_connection.ini</remarks>
         override public void Initialise(string connect)
         {
-            // TODO: do something with the connect string instead of
-            // ignoring it.
-
             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");
+
+            if (string.IsNullOrEmpty(connect))
+            {
+                database = new MSSQLManager(connect);
+            }
+            else
+            {
+                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_usersTableName = iniFile.ParseFileReadValue("userstablename");
             if (m_usersTableName == null)
@@ -93,23 +103,22 @@ namespace OpenSim.Data.MSSQL
                 m_agentsTableName = "agents";
             }
 
-            database =
-                new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId,
-                                 settingPassword);
-
+            //TODO this can be removed at one time!!!!!
             TestTables();
+
+            //Check migration on DB
+            database.CheckMigration(_migrationStore);
         }
 
-        public override void Dispose () {}
+        override public void Dispose() { }
 
         /// <summary>
-        ///
+        /// Can be deleted at one time!
         /// </summary>
         /// <returns></returns>
-        private bool TestTables()
+        private void TestTables()
         {
-
-            using (IDbCommand cmd = database.Query("select top 1 * from " + m_usersTableName, new Dictionary<string, string>()))
+            using (IDbCommand cmd = database.Query("select top 1 * from " + m_usersTableName))
             {
                 try
                 {
@@ -145,9 +154,53 @@ namespace OpenSim.Data.MSSQL
                 }
             }
 
-            return true;
+            using (IDbCommand cmd = database.Query("select top 1 * from avatarappearance", new Dictionary<string, string>()))
+            {
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch
+                {
+                    database.ExecuteResourceSql("AvatarAppearance.sql");
+                }
+            }
+
+            //Special for Migrations
+            using (AutoClosingSqlCommand cmd = database.Query("select * from migrations where name = 'UserStore'"))
+            {
+                try
+                {
+                    bool insert = true;
+                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    {
+                        if (reader.Read()) insert = false;
+                    }
+                    if (insert)
+                    {
+                        cmd.CommandText = "insert into migrations(name, version) values('UserStore', 1)";
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+                catch
+                {
+                    //No migrations table
+                    //HACK create one and add data
+                    cmd.CommandText = "create table migrations(name varchar(100), version int)";
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = "insert into migrations(name, version) values('migrations', 1)";
+                    cmd.ExecuteNonQuery();
+
+                    cmd.CommandText = "insert into migrations(name, version) values('UserStore', 1)";
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            return;
         }
 
+        #region User table methods
+
         /// <summary>
         /// Searches the database for a specified user profile by name components
         /// </summary>
@@ -156,623 +209,713 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A user profile</returns>
         override public UserProfileData GetUserByName(string user, string last)
         {
-            try
+            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second"))
             {
-                Dictionary<string, string> param = new Dictionary<string, string>();
-                param["first"] = user;
-                param["second"] = last;
+                command.Parameters.Add(database.CreateParameter("first", user));
+                command.Parameters.Add(database.CreateParameter("second", last));
 
-                using (IDbCommand result = database.Query("SELECT * FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second", param))
-                using (IDataReader reader = result.ExecuteReader())
+                try
                 {
-                    return database.readUserRow(reader);
+                    using (SqlDataReader reader = command.ExecuteReader())
+                    {
+                        return ReadUserRow(reader);
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[USER DB] Error getting user profile, error: " + e.Message);
+                    return null;
                 }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return null;
             }
         }
 
-        #region User Friends List Data
-
         /// <summary>
-        /// Add a new friend in the friendlist
+        /// See IUserDataPlugin
         /// </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)
+        /// <param name="uuid"></param>
+        /// <returns></returns>
+        override public UserProfileData GetUserByUUID(UUID uuid)
         {
-            int dtvalue = Util.UnixTimeSinceEpoch();
-
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.ToString();
-            param["@friendID"] = friend.ToString();
-            param["@friendPerms"] = perms.ToString();
-            param["@datetimestamp"] = dtvalue.ToString();
-
-            try
+            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = @uuid"))
             {
-                using (IDbCommand adder =
-                    database.Query(
-                    "INSERT INTO " + m_userFriendsTableName + " " +
-                    "(ownerID,friendID,friendPerms,datetimestamp) " +
-                    "VALUES " +
-                    "(@ownerID,@friendID,@friendPerms,@datetimestamp)",
-                        param))
+                command.Parameters.Add(database.CreateParameter("uuid", uuid));
+
+                try
                 {
-                    adder.ExecuteNonQuery();
+                    using (IDataReader reader = command.ExecuteReader())
+                    {
+                        return ReadUserRow(reader);
+                    }
                 }
-
-                using (IDbCommand adder =
-                    database.Query(
-                    "INSERT INTO " + m_userFriendsTableName + " " +
-                    "(ownerID,friendID,friendPerms,datetimestamp) " +
-                    "VALUES " +
-                    "(@friendID,@ownerID,@friendPerms,@datetimestamp)",
-                        param))
+                catch (Exception e)
                 {
-                    adder.ExecuteNonQuery();
+                    m_log.Error("[USER DB] Error getting user profile by UUID, error: " + e.Message);
+                    return null;
                 }
             }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return;
-            }
         }
 
+
         /// <summary>
-        /// Remove an friend from the friendlist
+        /// Creates a new users profile
         /// </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)
+        /// <param name="user">The user profile to create</param>
+        override public void AddNewUserProfile(UserProfileData user)
         {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.ToString();
-            param["@friendID"] = friend.ToString();
-
-
             try
             {
-                using (IDbCommand updater =
-                    database.Query(
-                    "delete from " + m_userFriendsTableName + " where ownerID = @ownerID and friendID = @friendID",
-                        param))
-                {
-                    updater.ExecuteNonQuery();
-                }
-
-                using (IDbCommand updater =
-                    database.Query(
-                    "delete from " + m_userFriendsTableName + " where ownerID = @friendID and friendID = @ownerID",
-                        param))
-                {
-                    updater.ExecuteNonQuery();
-                }
-
+                InsertUserRow(user.ID, user.FirstName, user.SurName, 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.Error(e.ToString());
+                m_log.Error("[USER DB] Error adding new profile, error: " + e.Message);
             }
         }
 
         /// <summary>
-        /// Update friendlist permission flag for a friend
+        /// update a user profile
         /// </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)
+        /// <param name="user">the profile to update</param>
+        /// <returns></returns>
+        override public bool UpdateUserProfile(UserProfileData user)
         {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.ToString();
-            param["@friendID"] = friend.ToString();
-            param["@friendPerms"] = perms.ToString();
-
-
-            try
+            using (AutoClosingSqlCommand command = database.Query("UPDATE " + m_usersTableName + " set UUID = @uuid, " +
+                                                                  "username = @username, " +
+                                                                  "lastname = @lastname," +
+                                                                  "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;"))
             {
-                using (IDbCommand updater =
-                    database.Query(
-                    "update " + m_userFriendsTableName +
-                    " SET friendPerms = @friendPerms " +
-                    "where ownerID = @ownerID and friendID = @friendID",
-                        param))
+                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("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
                 {
-                    updater.ExecuteNonQuery();
+                    int affected = command.ExecuteNonQuery();
+                    return (affected != 0);
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[USER DB] Error updating profile, error: " + e.Message);
                 }
             }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-            }
+            return false;
         }
 
+        #endregion
+
+        #region Agent table methods
+
         /// <summary>
-        /// Get (fetch?) the user's friendlist
+        /// Returns a user session searching by name
         /// </summary>
-        /// <param name="friendlistowner">UUID of the friendlist owner</param>
-        /// <returns>Friendlist list</returns>
-        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
+        /// <param name="name">The account name</param>
+        /// <returns>The users session</returns>
+        override public UserAgentData GetAgentByName(string name)
         {
-            List<FriendListItem> Lfli = new List<FriendListItem>();
+            return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
+        }
 
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param["@ownerID"] = friendlistowner.ToString();
+        /// <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);
+        }
 
-            try
+        /// <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)
+        {
+            using (AutoClosingSqlCommand command = database.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = @uuid"))
             {
-                //Left Join userfriends to itself
-                using (IDbCommand result =
-                    database.Query(
-                    "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())
+                command.Parameters.Add(database.CreateParameter("uuid", uuid));
+                try
                 {
-                    while (reader.Read())
+                    using (SqlDataReader reader = command.ExecuteReader())
                     {
-                        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);
+                        return readAgentRow(reader);
                     }
                 }
+                catch (Exception e)
+                {
+                    m_log.Error("[USER DB] Error updating agentdata by UUID, error: " + 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.Error(e.ToString());
+                m_log.Error("[USER DB] Error adding new agentdata, error: " + e.Message);
             }
-
-            return Lfli;
         }
 
         #endregion
 
+        #region User Friends List Data
+
         /// <summary>
-        /// STUB ! Update current region
+        /// Add a new friend in the friendlist
         /// </summary>
-        /// <param name="avatarid">avatar uuid</param>
-        /// <param name="regionuuid">region uuid</param>
-        /// <param name="regionhandle">region handle</param>
-        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
+        /// <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)
         {
-            //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
+            int dtvalue = Util.UnixTimeSinceEpoch();
+
+            using (AutoClosingSqlCommand command = database.Query(
+                "INSERT INTO " + m_userFriendsTableName + " " +
+                "(ownerID,friendID,friendPerms,datetimestamp) " +
+                "VALUES " +
+                "(@ownerID,@friendID,@friendPerms,@datetimestamp)"))
+            {
+                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
+                {
+                    command.CommandText = string.Format("INSERT INTO {0} (ownerID,friendID,friendPerms,datetimestamp) VALUES (@friendID,@ownerID,@friendPerms,@datetimestamp)",
+                            m_userFriendsTableName);
+
+                    command.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[USER DB] Error adding new userfriend, error: " + e.Message);
+                    return;
+                }
+            }
         }
 
         /// <summary>
-        ///
+        /// Remove an friend from the friendlist
         /// </summary>
-        /// <param name="queryID"></param>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
+        /// <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)
         {
-            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
-            string[] querysplit;
-            querysplit = query.Split(' ');
-            if (querysplit.Length == 2)
+            using (AutoClosingSqlCommand command = database.Query("delete from " + m_userFriendsTableName + " where ownerID = @ownerID and friendID = @friendID"))
             {
+                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
+                command.Parameters.Add(database.CreateParameter("@friendID", friend));
+                command.ExecuteNonQuery();
+
+                command.CommandText = "delete from " + m_userFriendsTableName +
+                                      " where ownerID = @friendID and friendID = @ownerID";
                 try
                 {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["first"] = querysplit[0];
-                    param["second"] = querysplit[1];
-
-                    using (IDbCommand result = database.Query("SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second", 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);
-                        }
-                    }
+                    command.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
-                    m_log.Error(e.ToString());
+                    m_log.Error("[USER DB] Error removing userfriend, error: " + e.Message);
                 }
             }
-            else if (querysplit.Length == 1)
+        }
+
+        /// <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)
+        {
+            using (AutoClosingSqlCommand command = database.Query(
+                "update " + m_userFriendsTableName +
+                " SET friendPerms = @friendPerms " +
+                "where ownerID = @ownerID and friendID = @friendID"))
             {
+                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
+                command.Parameters.Add(database.CreateParameter("@friendID", friend));
+                command.Parameters.Add(database.CreateParameter("@friendPerms", perms));
+
                 try
                 {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["first"] = querysplit[0];
-
-                    using (IDbCommand result = database.Query("SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first OR lastname = @first", 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);
-                        }
-                    }
+                    command.ExecuteNonQuery();
                 }
                 catch (Exception e)
                 {
-                    m_log.Error(e.ToString());
+                    m_log.Error("[USER DB] Error updating userfriend, error: " + e.Message);
                 }
             }
-            return returnlist;
         }
 
         /// <summary>
-        /// See IUserDataPlugin
+        /// Get (fetch?) the user's friendlist
         /// </summary>
-        /// <param name="uuid"></param>
-        /// <returns></returns>
-        override public UserProfileData GetUserByUUID(UUID uuid)
+        /// <param name="friendlistowner">UUID of the friendlist owner</param>
+        /// <returns>Friendlist list</returns>
+        override public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
         {
-            try
+            List<FriendListItem> friendList = new List<FriendListItem>();
+
+            //Left Join userfriends to itself
+            using (AutoClosingSqlCommand command = database.Query(
+                "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"))
             {
-                Dictionary<string, string> param = new Dictionary<string, string>();
-                param["uuid"] = uuid.ToString();
+                command.Parameters.Add(database.CreateParameter("@ownerID", friendlistowner));
+
+                try
+                {
+                    using (IDataReader reader = command.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"]);
 
-                using (IDbCommand result = database.Query("SELECT * FROM " + m_usersTableName + " WHERE UUID = @uuid", param))
-                using (IDataReader reader = result.ExecuteReader())
+                            // 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)
                 {
-                    return database.readUserRow(reader);
+                    m_log.Error("[USER DB] Error updating userfriend, error: " + e.Message);
                 }
             }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return null;
-            }
+
+            return friendList;
         }
 
+        #endregion
+
+        #region Money functions (not used)
+
         /// <summary>
-        /// Returns a user session searching by name
+        /// Performs a money transfer request between two accounts
         /// </summary>
-        /// <param name="name">The account name</param>
-        /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByName(string name)
+        /// <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 GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
+            return false;
         }
 
         /// <summary>
-        /// Returns a user session by account name
+        /// Performs an inventory transfer request between two accounts
         /// </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)
+        /// <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)
         {
-            UserProfileData profile = GetUserByName(user, last);
-            return GetAgentByUUID(profile.ID);
+            return false;
         }
 
+        #endregion
+
+        #region Appearance methods
+
         /// <summary>
-        /// Returns an agent session by account UUID
+        /// Gets the user appearance.
         /// </summary>
-        /// <param name="uuid">The accounts UUID</param>
-        /// <returns>The users session</returns>
-        override public UserAgentData GetAgentByUUID(UUID uuid)
+        /// <param name="user">The user.</param>
+        /// <returns></returns>
+        /// TODO: stubs for now to get us to a compiling state gently
+        override public AvatarAppearance GetUserAppearance(UUID user)
         {
             try
             {
-                Dictionary<string, string> param = new Dictionary<string, string>();
-                param["uuid"] = uuid.ToString();
+                AvatarAppearance appearance = new AvatarAppearance();
 
-                using (IDbCommand result = database.Query("SELECT * FROM " + m_agentsTableName + " WHERE UUID = @uuid", param))
-                using (IDataReader reader = result.ExecuteReader())
+                using (AutoClosingSqlCommand command = database.Query("SELECT * FROM avatarappearance WHERE owner = @UUID"))
                 {
-                    return database.readAgentRow(reader);
+                    command.Parameters.Add(database.CreateParameter("@UUID", user));
+                    using (IDataReader reader = command.ExecuteReader())
+                    {
+                        if (reader.Read())
+                            appearance = readUserAppearance(reader);
+                    }
                 }
+
+                appearance.SetAttachments(GetUserAttachments(user));
+
+                return appearance;
             }
             catch (Exception e)
             {
-                m_log.Error(e.ToString());
-                return null;
+                m_log.Error("[USER DB] Error updating userfriend, error: " + e.Message);
             }
+            return null;
         }
 
+
         /// <summary>
-        /// Store a weblogin key
+        /// Update a user appearence into database
         /// </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)
+        /// <param name="user">the used UUID</param>
+        /// <param name="appearance">the appearence</param>
+        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
         {
-            UserProfileData user = GetUserByUUID(AgentID);
-            user.WebLoginKey = WebLoginKey;
-            UpdateUserProfile(user);
+            string sql = String.Empty;
+            sql += "DELETE FROM avatarappearance WHERE owner=@owner ";
+            sql += "INSERT INTO avatarappearance ";
+            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) 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)";
+
+            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.ToBytes()));
+                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.Error("[USER DB] Error updating user appearance, error: " + e.Message);
+                }
+            }
+
+            UpdateUserAttachments(user, appearance.GetAttachments());
         }
+
+        #endregion
+
+        #region Attachment methods
+
         /// <summary>
-        /// Creates a new users profile
+        /// Gets all attachment of a agent.
         /// </summary>
-        /// <param name="user">The user profile to create</param>
-        override public void AddNewUserProfile(UserProfileData user)
+        /// <param name="agentID">agent ID.</param>
+        /// <returns></returns>
+        public Hashtable GetUserAttachments(UUID agentID)
         {
-            try
-            {
-                InsertUserRow(user.ID, user.FirstName, user.SurName, 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);
-            }
-            catch (Exception e)
+            Hashtable returnTable = new Hashtable();
+            using (AutoClosingSqlCommand command = database.Query("select attachpoint, item, asset from avatarattachments where UUID = @uuid", database.CreateParameter("@uuid", agentID)))
             {
-                m_log.Error(e.ToString());
+                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>
-        /// Creates a new user and inserts it into the database
+        /// Updates all attachments of the agent.
         /// </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>
-        /// <returns>Success?</returns>
-        private bool InsertUserRow(UUID uuid, string username, string lastname, 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)
-        {
-            string sql = "INSERT INTO "+m_usersTableName;
-            sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], ";
-            sql +=
-                "[homeLocationX], [homeLocationY], [homeLocationZ], [homeLookAtX], [homeLookAtY], [homeLookAtZ], [created], ";
-            sql +=
-                "[lastLogin], [userInventoryURI], [userAssetURI], [profileCanDoMask], [profileWantDoMask], [profileAboutText], ";
-            sql += "[profileFirstText], [profileImage], [profileFirstImage], [webLoginKey]) VALUES ";
+        /// <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";
 
-            sql += "(@UUID, @username, @lastname, @passwordHash, @passwordSalt, @homeRegion, ";
-            sql +=
-                "@homeLocationX, @homeLocationY, @homeLocationZ, @homeLookAtX, @homeLookAtY, @homeLookAtZ, @created, ";
-            sql +=
-                "@lastLogin, @userInventoryURI, @userAssetURI, @profileCanDoMask, @profileWantDoMask, @profileAboutText, ";
-            sql += "@profileFirstText, @profileImage, @profileFirstImage, @webLoginKey);";
-
-            Dictionary<string, string> parameters = new Dictionary<string, string>();
-            parameters["UUID"] = uuid.ToString();
-            parameters["username"] = username.ToString();
-            parameters["lastname"] = lastname.ToString();
-            parameters["passwordHash"] = passwordHash.ToString();
-            parameters["passwordSalt"] = passwordSalt.ToString();
-            parameters["homeRegion"] = homeRegion.ToString();
-            parameters["homeLocationX"] = homeLocX.ToString();
-            parameters["homeLocationY"] = homeLocY.ToString();
-            parameters["homeLocationZ"] = homeLocZ.ToString();
-            parameters["homeLookAtX"] = homeLookAtX.ToString();
-            parameters["homeLookAtY"] = homeLookAtY.ToString();
-            parameters["homeLookAtZ"] = homeLookAtZ.ToString();
-            parameters["created"] = created.ToString();
-            parameters["lastLogin"] = lastlogin.ToString();
-            parameters["userInventoryURI"] = String.Empty;
-            parameters["userAssetURI"] = String.Empty;
-            parameters["profileCanDoMask"] = "0";
-            parameters["profileWantDoMask"] = "0";
-            parameters["profileAboutText"] = aboutText;
-            parameters["profileFirstText"] = firstText;
-            parameters["profileImage"] = profileImage.ToString();
-            parameters["profileFirstImage"] = firstImage.ToString();
-            parameters["webLoginKey"] = UUID.Random().ToString();
+            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)";
 
-            try
+            using (AutoClosingSqlCommand command = database.Query(sql))
             {
-                using (IDbCommand result = database.Query(sql, parameters))
+                bool firstTime = true;
+                foreach (DictionaryEntry e in data)
                 {
-                    return (result.ExecuteNonQuery() == 1);
+                    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", item["item"].ToString()));
+                        command.Parameters.Add(database.CreateParameter("@asset", item["asset"].ToString()));
+                        firstTime = false;
+                    }
+                    command.Parameters["@uuid"].Value = agentID.ToString();
+                    command.Parameters["@attachpoint"].Value = attachpoint;
+                    command.Parameters["@item"].Value = item["item"].ToString();
+                    command.Parameters["@asset"].Value = item["asset"].ToString();
+
+                    try
+                    {
+                        command.ExecuteNonQuery();
+                    }
+                    catch (Exception ex)
+                    {
+                        m_log.DebugFormat("[USER DB] : Error adding user attachment. {0}", ex.Message);
+                    }
                 }
             }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-                return false;
-            }
-
         }
 
         /// <summary>
-        /// Creates a new agent
+        /// Resets all attachments of a agent in the database.
         /// </summary>
-        /// <param name="agent">The agent to create</param>
-        override public void AddNewUserAgent(UserAgentData agent)
+        /// <param name="agentID">agentID.</param>
+        override public void ResetAttachments(UUID agentID)
         {
-            try
+            using (AutoClosingSqlCommand command = database.Query("update avatarattachments set asset = '00000000-0000-0000-0000-000000000000' where UUID = @uuid"))
             {
-                database.insertAgentRow(agent);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
+                command.Parameters.Add(database.CreateParameter("uuid", agentID));
+                command.ExecuteNonQuery();
             }
         }
 
+        #endregion
+
+        #region Other public methods
+
         /// <summary>
-        /// update a user profile
+        /// STUB ! Update current region
         /// </summary>
-        /// <param name="user">the profile to update</param>
+        /// <param name="avatarid">avatar uuid</param>
+        /// <param name="regionuuid">region uuid</param>
+        /// <param name="regionhandle">region handle</param>
+        override public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
+        {
+            //m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="queryID"></param>
+        /// <param name="query"></param>
         /// <returns></returns>
-        override public bool UpdateUserProfile(UserProfileData user)
+        override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
         {
-            using (IDbCommand command = database.Query("UPDATE " + m_usersTableName + " set UUID = @uuid, " +
-                                                "username = @username, " +
-                                                "lastname = @lastname," +
-                                                "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  where " +
-                                                "UUID = @keyUUUID;"))
-            {
-                SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
-                SqlParameter param2 = new SqlParameter("@username", user.FirstName);
-                SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
-                SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
-                SqlParameter param5 = new SqlParameter("@passwordSalt", user.PasswordSalt);
-                SqlParameter param6 = new SqlParameter("@homeRegion", Convert.ToInt64(user.HomeRegion));
-                SqlParameter param7 = new SqlParameter("@homeLocationX", user.HomeLocation.X);
-                SqlParameter param8 = new SqlParameter("@homeLocationY", user.HomeLocation.Y);
-                SqlParameter param9 = new SqlParameter("@homeLocationZ", user.HomeLocation.Y);
-                SqlParameter param10 = new SqlParameter("@homeLookAtX", user.HomeLookAt.X);
-                SqlParameter param11 = new SqlParameter("@homeLookAtY", user.HomeLookAt.Y);
-                SqlParameter param12 = new SqlParameter("@homeLookAtZ", user.HomeLookAt.Z);
-                SqlParameter param13 = new SqlParameter("@created", Convert.ToInt32(user.Created));
-                SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
-                SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
-                SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
-                SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.CanDoMask));
-                SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
-                SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
-                SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
-                SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
-                SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
-                SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
-                SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.ToString());
-                command.Parameters.Add(param1);
-                command.Parameters.Add(param2);
-                command.Parameters.Add(param3);
-                command.Parameters.Add(param4);
-                command.Parameters.Add(param5);
-                command.Parameters.Add(param6);
-                command.Parameters.Add(param7);
-                command.Parameters.Add(param8);
-                command.Parameters.Add(param9);
-                command.Parameters.Add(param10);
-                command.Parameters.Add(param11);
-                command.Parameters.Add(param12);
-                command.Parameters.Add(param13);
-                command.Parameters.Add(param14);
-                command.Parameters.Add(param15);
-                command.Parameters.Add(param16);
-                command.Parameters.Add(param17);
-                command.Parameters.Add(param18);
-                command.Parameters.Add(param19);
-                command.Parameters.Add(param20);
-                command.Parameters.Add(param21);
-                command.Parameters.Add(param22);
-                command.Parameters.Add(param23);
-                command.Parameters.Add(param24);
+            List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
+            string[] querysplit = query.Split(' ');
+            if (querysplit.Length == 2)
+            {
                 try
                 {
-                    int affected = command.ExecuteNonQuery();
-                    return (affected != 0);
+                    using (AutoClosingSqlCommand command = database.Query("SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username LIKE @first AND lastname LIKE @second"))
+                    {
+                        //Add wildcard to the search
+                        command.Parameters.Add(database.CreateParameter("first", querysplit[0] + "%"));
+                        command.Parameters.Add(database.CreateParameter("second", querysplit[1] + "%"));
+                        using (IDataReader reader = command.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.ToString());
                 }
             }
-            return false;
+            else if (querysplit.Length == 1)
+            {
+                try
+                {
+                    using (AutoClosingSqlCommand command = database.Query("SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username LIKE @first OR lastname LIKE @first"))
+                    {
+                        command.Parameters.Add(database.CreateParameter("first", querysplit[0] + "%"));
+
+                        using (IDataReader reader = command.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.ToString());
+                }
+            }
+            return returnlist;
         }
 
         /// <summary>
-        /// Performs a money transfer request between two accounts
+        /// Store a weblogin key
         /// </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)
+        /// <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)
         {
-            return false;
+            UserProfileData user = GetUserByUUID(AgentID);
+            user.WebLoginKey = WebLoginKey;
+            UpdateUserProfile(user);
+
         }
 
         /// <summary>
-        /// Performs an inventory transfer request between two accounts
+        /// Database provider name
         /// </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)
+        /// <returns>Provider name</returns>
+        override public string Name
         {
-            return false;
+            get { return "MSSQL Userdata Interface"; }
         }
 
-        /// Appearance
-        /// TODO: stubs for now to get us to a compiling state gently
-        override public AvatarAppearance GetUserAppearance(UUID user)
+        /// <summary>
+        /// Database provider version
+        /// </summary>
+        /// <returns>provider version</returns>
+        override public string Version
         {
-//            return new AvatarAppearance();
-            try
-            {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    param["@UUID"] = user.ToString();
-
-                    using (IDbCommand result =
-                        database.Query("SELECT * FROM avatarappearance WHERE owner = @UUID", param))
-                    using (IDataReader reader = result.ExecuteReader())
-                    {
-                        AvatarAppearance item = null;
-                        if (reader.Read())
-                            item = readUserAppearance(reader);
-                        return item;
-                    }
-            }
-            catch (Exception e)
-            {
-                m_log.Error(e.ToString());
-            }
-            return null;
+            get { return database.getVersion(); }
         }
 
+        #endregion
+
+        #region Private functions
+
         /// <summary>
         /// Reads a one item from an SQL result
         /// </summary>
@@ -827,99 +970,254 @@ namespace OpenSim.Data.MSSQL
         }
 
         /// <summary>
-        /// Update a user appearence into database
+        /// Insert/Update a agent row in the DB.
         /// </summary>
-        /// <param name="user">the used UUID</param>
-        /// <param name="appearance">the appearence</param>
-        override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
+        /// <param name="agentdata">agentdata.</param>
+        private void InsertUpdateAgentRow(UserAgentData agentdata)
         {
-            string sql = String.Empty;
-            sql += "DELETE FROM avatarappearance WHERE owner=@owner ";
-            sql += "INSERT INTO avatarappearance ";
-            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) 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)";
-
-            using (AutoClosingSqlCommand cmd = database.Query(sql))
+            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))
             {
-                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.ToBytes());
-                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());
-
+                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
                 {
-                    cmd.ExecuteNonQuery();
+                    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>
-        /// Database provider name
+        /// Reads an agent row from a database reader
         /// </summary>
-        /// <returns>Provider name</returns>
-        override public string Name
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user session agent</returns>
+        private UserAgentData readAgentRow(IDataReader reader)
         {
-            get {return "MSSQL Userdata Interface";}
+            UserAgentData retval = new UserAgentData();
+
+            if (reader.Read())
+            {
+                // Agent IDs
+                retval.ProfileID = new UUID((string)reader["UUID"]);
+                retval.SessionID = new UUID((string)reader["sessionID"]);
+                retval.SecureSessionID = new UUID((string)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 = (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;
+
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
         }
 
         /// <summary>
-        /// Database provider version
+        /// Creates a new user and inserts it into the database
         /// </summary>
-        /// <returns>provider version</returns>
-        override public string Version
+        /// <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">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 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)
         {
-            get {return database.getVersion();}
+            string sql = "INSERT INTO " + m_usersTableName;
+            sql += " ([UUID], [username], [lastname], [passwordHash], [passwordSalt], [homeRegion], ";
+            sql += "[homeLocationX], [homeLocationY], [homeLocationZ], [homeLookAtX], [homeLookAtY], [homeLookAtZ], [created], ";
+            sql += "[lastLogin], [userInventoryURI], [userAssetURI], [profileCanDoMask], [profileWantDoMask], [profileAboutText], ";
+            sql += "[profileFirstText], [profileImage], [profileFirstImage], [webLoginKey], ";
+            sql += "[homeRegionID], [userFlags], [godLevel], [customType], [partner]) VALUES ";
+
+            sql += "(@UUID, @username, @lastname, @passwordHash, @passwordSalt, @homeRegion, ";
+            sql += "@homeLocationX, @homeLocationY, @homeLocationZ, @homeLookAtX, @homeLookAtY, @homeLookAtZ, @created, ";
+            sql += "@lastLogin, @userInventoryURI, @userAssetURI, @profileCanDoMask, @profileWantDoMask, @profileAboutText, ";
+            sql += "@profileFirstText, @profileImage, @profileFirstImage, @webLoginKey, ";
+            sql += "@homeRegionID, @userFlags, @godLevel, @customType, @partner)";
+
+            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("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>
-        /// Not implemented
+        /// Reads a user profile from an active data reader
         /// </summary>
-        /// <param name="query"></param>
-        public void runQuery(string query)
+        /// <param name="reader">An active database reader</param>
+        /// <returns>A user profile</returns>
+        private static UserProfileData ReadUserRow(IDataReader reader)
         {
-        }
+            UserProfileData retval = new UserProfileData();
 
-        override public void ResetAttachments(UUID userID)
-        {
+            if (reader.Read())
+            {
+                retval.ID = new UUID((string)reader["UUID"]);
+                retval.FirstName = (string)reader["username"];
+                retval.SurName = (string)reader["lastname"];
+
+                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()));
+
+                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());
+
+                retval.AboutText = (string)reader["profileAboutText"];
+                retval.FirstLifeAboutText = (string)reader["profileFirstText"];
+
+                retval.Image = new UUID((string)reader["profileImage"]);
+                retval.FirstLifeImage = new UUID((string)reader["profileFirstImage"]);
+                retval.WebLoginKey = new UUID((string)reader["webLoginKey"]);
+            }
+            else
+            {
+                return null;
+            }
+            return retval;
         }
+
+        #endregion
     }
+
 }