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.MSSQL/MSSQLUserData.cs | 42 +++++++++++++--------------
1 file changed, 21 insertions(+), 21 deletions(-)
(limited to 'OpenSim/Framework/Data.MSSQL')
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
index 979e349..be0417d 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Data.MSSQL
///
/// A database interface class to a user profile storage system
///
- public class MSSQLUserData : IUserData
+ public class MSSQLUserData : UserDataBase
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Data.MSSQL
///
/// 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?
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// The first part of the account name
/// The second part of the account name
/// A user profile
- public UserProfileData GetUserByName(string user, string last)
+ override public UserProfileData GetUserByName(string user, string last)
{
try
{
@@ -163,7 +163,7 @@ namespace OpenSim.Framework.Data.MSSQL
#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();
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
}
- public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
+ override public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend)
{
Dictionary param = new Dictionary();
param["@ownerID"] = friendlistowner.UUID.ToString();
@@ -239,7 +239,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
}
- 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();
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
- public List GetUserFriendList(LLUUID friendlistowner)
+ override public List GetUserFriendList(LLUUID friendlistowner)
{
List Lfli = new List();
@@ -318,14 +318,14 @@ namespace OpenSim.Framework.Data.MSSQL
#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();
string[] querysplit;
@@ -405,7 +405,7 @@ namespace OpenSim.Framework.Data.MSSQL
}
// See IUserData
- public UserProfileData GetUserByUUID(LLUUID uuid)
+ override public UserProfileData GetUserByUUID(LLUUID uuid)
{
try
{
@@ -438,7 +438,7 @@ namespace OpenSim.Framework.Data.MSSQL
///
/// 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]);
}
@@ -449,7 +449,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// 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);
@@ -460,7 +460,7 @@ namespace OpenSim.Framework.Data.MSSQL
///
/// The accounts UUID
/// The users session
- public UserAgentData GetAgentByUUID(LLUUID uuid)
+ override public UserAgentData GetAgentByUUID(LLUUID uuid)
{
try
{
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Data.MSSQL
return null;
}
}
- public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
+ override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
{
UserProfileData user = GetUserByUUID(AgentID);
user.webLoginKey = WebLoginKey;
@@ -498,7 +498,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// Creates a new users profile
///
/// The user profile to create
- public void AddNewUserProfile(UserProfileData user)
+ override public void AddNewUserProfile(UserProfileData user)
{
try
{
@@ -618,13 +618,13 @@ namespace OpenSim.Framework.Data.MSSQL
/// Creates a new agent
///
/// The agent to create
- public void AddNewUserAgent(UserAgentData agent)
+ override public void AddNewUserAgent(UserAgentData agent)
{
// Do nothing.
}
- public bool UpdateUserProfile(UserProfileData user)
+ override public bool UpdateUserProfile(UserProfileData user)
{
SqlCommand command = new SqlCommand("UPDATE " + m_usersTableName + " set UUID = @uuid, " +
"username = @username, " +
@@ -724,7 +724,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// 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;
}
@@ -737,7 +737,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// 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;
}
@@ -746,7 +746,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// Database provider name
///
/// Provider name
- public string getName()
+ override public string getName()
{
return "MSSQL Userdata Interface";
}
@@ -755,7 +755,7 @@ namespace OpenSim.Framework.Data.MSSQL
/// Database provider version
///
/// provider version
- public string GetVersion()
+ override public string GetVersion()
{
return database.getVersion();
}
--
cgit v1.1