From 6eb5754f5a4b9707f43572ce1e5743054d784818 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 29 Dec 2009 13:27:21 -0800
Subject: Polished the IUserService interface.
---
OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 5 +++++
OpenSim/Data/MySQL/MySQLUserAccountData.cs | 8 ++++----
OpenSim/Services/Connectors/User/UserServiceConnector.cs | 10 +++++-----
OpenSim/Services/Interfaces/IUserService.cs | 3 ++-
OpenSim/Services/UserService/UserService.cs | 10 +++++-----
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 2d92cb1..4db2777 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -168,6 +168,11 @@ namespace OpenSim.Data.MSSQL
return true;
}
+ public bool Store(UserAccountData data, UUID principalID, string token)
+ {
+ return false;
+ }
+
public bool SetDataItem(UUID principalID, string item, string value)
{
string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index e3b5f1d..c6eb44d 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -40,10 +40,10 @@ namespace OpenSim.Data.MySQL
public MySqlUserAccountData(string connectionString, string realm)
: base(connectionString, realm, "UserAccount")
{
- public bool Store(UserAccountData data, UUID principalID, string token)
- {
- Store(data);
- }
+ }
+ public bool Store(UserAccountData data, UUID principalID, string token)
+ {
+ return Store(data);
}
}
}
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
index 683990f..2911e2f 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
@@ -86,14 +86,14 @@ namespace OpenSim.Services.Connectors
return null;
}
- public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+ public UserAccount GetUserAccount(UUID scopeID, string email)
{
return null;
}
-
- public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
+
+ public UserAccount GetUserAccount(UUID scopeID, UUID userID)
{
- return false;
+ return null;
}
public bool SetUserAccount(UserAccount data, UUID principalID, string token)
@@ -106,7 +106,7 @@ namespace OpenSim.Services.Connectors
return false;
}
- public List<UserAccount> GetUserAccount(UUID scopeID, string query)
+ public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
{
return null;
}
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 8279b9a..b6f8774 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -89,10 +89,11 @@ namespace OpenSim.Services.Interfaces
{
UserAccount GetUserAccount(UUID scopeID, UUID userID);
UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
+ UserAccount GetUserAccount(UUID scopeID, string Email);
// Returns the list of avatars that matches both the search
// criterion and the scope ID passed
//
- List<UserAccount> GetUserAccount(UUID scopeID, string query);
+ List<UserAccount> GetUserAccounts(UUID scopeID, string query);
// Update all updatable fields
//
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
index e8b9fc3..686ae20 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Services/UserService/UserService.cs
@@ -47,14 +47,14 @@ namespace OpenSim.Services.UserAccountService
return null;
}
- public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+ public UserAccount GetUserAccount(UUID scopeID, string email)
{
return null;
}
-
- public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
+
+ public UserAccount GetUserAccount(UUID scopeID, UUID userID)
{
- return false;
+ return null;
}
public bool SetUserAccount(UserAccount data, UUID principalID, string token)
@@ -67,7 +67,7 @@ namespace OpenSim.Services.UserAccountService
return false;
}
- public List<UserAccount> GetUserAccount(UUID scopeID,
+ public List<UserAccount> GetUserAccounts(UUID scopeID,
string query)
{
return null;
--
cgit v1.1