aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-12-29 13:27:21 -0800
committerDiva Canto2009-12-29 13:27:21 -0800
commit6eb5754f5a4b9707f43572ce1e5743054d784818 (patch)
tree4112cfaa1bd0673752b1c304043e988a3ab3d7c6
parentChange the interface a bit before someone depends on it's current form (diff)
downloadopensim-SC_OLD-6eb5754f5a4b9707f43572ce1e5743054d784818.zip
opensim-SC_OLD-6eb5754f5a4b9707f43572ce1e5743054d784818.tar.gz
opensim-SC_OLD-6eb5754f5a4b9707f43572ce1e5743054d784818.tar.bz2
opensim-SC_OLD-6eb5754f5a4b9707f43572ce1e5743054d784818.tar.xz
Polished the IUserService interface.
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserAccountData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLUserAccountData.cs8
-rw-r--r--OpenSim/Services/Connectors/User/UserServiceConnector.cs10
-rw-r--r--OpenSim/Services/Interfaces/IUserService.cs3
-rw-r--r--OpenSim/Services/UserService/UserService.cs10
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
168 return true; 168 return true;
169 } 169 }
170 170
171 public bool Store(UserAccountData data, UUID principalID, string token)
172 {
173 return false;
174 }
175
171 public bool SetDataItem(UUID principalID, string item, string value) 176 public bool SetDataItem(UUID principalID, string item, string value)
172 { 177 {
173 string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item); 178 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
40 public MySqlUserAccountData(string connectionString, string realm) 40 public MySqlUserAccountData(string connectionString, string realm)
41 : base(connectionString, realm, "UserAccount") 41 : base(connectionString, realm, "UserAccount")
42 { 42 {
43 public bool Store(UserAccountData data, UUID principalID, string token) 43 }
44 { 44 public bool Store(UserAccountData data, UUID principalID, string token)
45 Store(data); 45 {
46 } 46 return Store(data);
47 } 47 }
48 } 48 }
49} 49}
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
86 return null; 86 return null;
87 } 87 }
88 88
89 public UserAccount GetUserAccount(UUID scopeID, UUID userID) 89 public UserAccount GetUserAccount(UUID scopeID, string email)
90 { 90 {
91 return null; 91 return null;
92 } 92 }
93 93
94 public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret) 94 public UserAccount GetUserAccount(UUID scopeID, UUID userID)
95 { 95 {
96 return false; 96 return null;
97 } 97 }
98 98
99 public bool SetUserAccount(UserAccount data, UUID principalID, string token) 99 public bool SetUserAccount(UserAccount data, UUID principalID, string token)
@@ -106,7 +106,7 @@ namespace OpenSim.Services.Connectors
106 return false; 106 return false;
107 } 107 }
108 108
109 public List<UserAccount> GetUserAccount(UUID scopeID, string query) 109 public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
110 { 110 {
111 return null; 111 return null;
112 } 112 }
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
89 { 89 {
90 UserAccount GetUserAccount(UUID scopeID, UUID userID); 90 UserAccount GetUserAccount(UUID scopeID, UUID userID);
91 UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName); 91 UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName);
92 UserAccount GetUserAccount(UUID scopeID, string Email);
92 // Returns the list of avatars that matches both the search 93 // Returns the list of avatars that matches both the search
93 // criterion and the scope ID passed 94 // criterion and the scope ID passed
94 // 95 //
95 List<UserAccount> GetUserAccount(UUID scopeID, string query); 96 List<UserAccount> GetUserAccounts(UUID scopeID, string query);
96 97
97 // Update all updatable fields 98 // Update all updatable fields
98 // 99 //
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
47 return null; 47 return null;
48 } 48 }
49 49
50 public UserAccount GetUserAccount(UUID scopeID, UUID userID) 50 public UserAccount GetUserAccount(UUID scopeID, string email)
51 { 51 {
52 return null; 52 return null;
53 } 53 }
54 54
55 public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret) 55 public UserAccount GetUserAccount(UUID scopeID, UUID userID)
56 { 56 {
57 return false; 57 return null;
58 } 58 }
59 59
60 public bool SetUserAccount(UserAccount data, UUID principalID, string token) 60 public bool SetUserAccount(UserAccount data, UUID principalID, string token)
@@ -67,7 +67,7 @@ namespace OpenSim.Services.UserAccountService
67 return false; 67 return false;
68 } 68 }
69 69
70 public List<UserAccount> GetUserAccount(UUID scopeID, 70 public List<UserAccount> GetUserAccounts(UUID scopeID,
71 string query) 71 string query)
72 { 72 {
73 return null; 73 return null;