From ca718b6f8d5a76f4f4dcb6625c01c3ec15371bd6 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Fri, 28 Mar 2008 19:58:45 +0000 Subject: * Introduced common abstract UserDataBase provider * Weeded out multiple AvatarPickerAvatar classes --- OpenSim/Framework/Data.MySQL/MySQLUserData.cs | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'OpenSim/Framework/Data.MySQL/MySQLUserData.cs') diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs index 010e911..fd640ec 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs @@ -37,7 +37,7 @@ namespace OpenSim.Framework.Data.MySQL /// /// A database interface class to a user profile storage system /// - internal class MySQLUserData : IUserData + internal class MySQLUserData : UserDataBase { private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); @@ -53,7 +53,7 @@ namespace OpenSim.Framework.Data.MySQL /// /// Loads and initialises the MySQL storage plugin /// - public void Initialise() + override public void Initialise() { // Load from an INI file connection details // TODO: move this to XML? Yes, PLEASE! @@ -164,7 +164,7 @@ namespace OpenSim.Framework.Data.MySQL #endregion // see IUserData - public UserProfileData GetUserByName(string user, string last) + override public UserProfileData GetUserByName(string user, string last) { try { @@ -195,7 +195,7 @@ namespace OpenSim.Framework.Data.MySQL #region User Friends List Data - public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) + override public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { int dtvalue = Util.UnixTimeSinceEpoch(); @@ -236,7 +236,7 @@ namespace OpenSim.Framework.Data.MySQL } } - public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) + override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { Dictionary param = new Dictionary(); param["?ownerID"] = friendlistowner.UUID.ToString(); @@ -267,7 +267,7 @@ namespace OpenSim.Framework.Data.MySQL } } - public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) + override public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { Dictionary param = new Dictionary(); param["?ownerID"] = friendlistowner.UUID.ToString(); @@ -295,7 +295,7 @@ namespace OpenSim.Framework.Data.MySQL } } - public List GetUserFriendList(LLUUID friendlistowner) + override public List GetUserFriendList(LLUUID friendlistowner) { List Lfli = new List(); @@ -342,12 +342,12 @@ namespace OpenSim.Framework.Data.MySQL #endregion - public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) + override public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid) { m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); } - public List GeneratePickerResults(LLUUID queryID, string query) + override public List GeneratePickerResults(LLUUID queryID, string query) { List returnlist = new List(); @@ -427,7 +427,7 @@ namespace OpenSim.Framework.Data.MySQL } // see IUserData - public UserProfileData GetUserByUUID(LLUUID uuid) + override public UserProfileData GetUserByUUID(LLUUID uuid) { try { @@ -460,7 +460,7 @@ namespace OpenSim.Framework.Data.MySQL /// /// The account name /// The users session - public UserAgentData GetAgentByName(string name) + override public UserAgentData GetAgentByName(string name) { return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); } @@ -471,13 +471,13 @@ namespace OpenSim.Framework.Data.MySQL /// First part of the users account name /// Second part of the users account name /// The users session - public UserAgentData GetAgentByName(string user, string last) + override public UserAgentData GetAgentByName(string user, string last) { UserProfileData profile = GetUserByName(user, last); return GetAgentByUUID(profile.UUID); } - public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) + override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) { Dictionary param = new Dictionary(); param["?UUID"] = AgentID.UUID.ToString(); @@ -508,7 +508,7 @@ namespace OpenSim.Framework.Data.MySQL /// /// The accounts UUID /// The users session - public UserAgentData GetAgentByUUID(LLUUID uuid) + override public UserAgentData GetAgentByUUID(LLUUID uuid) { try { @@ -540,7 +540,7 @@ namespace OpenSim.Framework.Data.MySQL /// Creates a new users profile /// /// The user profile to create - public void AddNewUserProfile(UserProfileData user) + override public void AddNewUserProfile(UserProfileData user) { try { @@ -567,7 +567,7 @@ namespace OpenSim.Framework.Data.MySQL /// Creates a new agent /// /// The agent to create - public void AddNewUserAgent(UserAgentData agent) + override public void AddNewUserAgent(UserAgentData agent) { try { @@ -587,7 +587,7 @@ namespace OpenSim.Framework.Data.MySQL /// Updates a user profile stored in the DB /// /// The profile data to use to update the DB - public bool UpdateUserProfile(UserProfileData user) + override public bool UpdateUserProfile(UserProfileData user) { database.updateUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, user.homeRegion, user.homeLocation.X, user.homeLocation.Y, user.homeLocation.Z, user.homeLookAt.X, @@ -604,7 +604,7 @@ namespace OpenSim.Framework.Data.MySQL /// The receivers account ID /// The amount to transfer /// Success? - public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) + override public bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return false; } @@ -617,7 +617,7 @@ namespace OpenSim.Framework.Data.MySQL /// The receivers account ID /// The item to transfer /// Success? - public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) + override public bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID item) { return false; } @@ -626,7 +626,7 @@ namespace OpenSim.Framework.Data.MySQL /// Database provider name /// /// Provider name - public string getName() + override public string getName() { return "MySQL Userdata Interface"; } @@ -635,7 +635,7 @@ namespace OpenSim.Framework.Data.MySQL /// Database provider version /// /// provider version - public string GetVersion() + override public string GetVersion() { return "0.1"; } -- cgit v1.1