diff options
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 0acfdcf..961698c 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -173,6 +173,10 @@ namespace OpenSim.Services.UserAccountService | |||
173 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); | 173 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); |
174 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) | 174 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) |
175 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); | 175 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); |
176 | if (d.Data.ContainsKey("UserCountry") && d.Data["UserCountry"] != null) | ||
177 | u.UserCountry = d.Data["UserCountry"].ToString(); | ||
178 | else | ||
179 | u.UserTitle = string.Empty; | ||
176 | 180 | ||
177 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) | 181 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) |
178 | { | 182 | { |
@@ -294,7 +298,22 @@ namespace OpenSim.Services.UserAccountService | |||
294 | 298 | ||
295 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) | 299 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) |
296 | { | 300 | { |
297 | UserAccountData[] d = m_Database.GetUsers(scopeID, query); | 301 | UserAccountData[] d = m_Database.GetUsers(scopeID, query.Trim()); |
302 | |||
303 | if (d == null) | ||
304 | return new List<UserAccount>(); | ||
305 | |||
306 | List<UserAccount> ret = new List<UserAccount>(); | ||
307 | |||
308 | foreach (UserAccountData data in d) | ||
309 | ret.Add(MakeUserAccount(data)); | ||
310 | |||
311 | return ret; | ||
312 | } | ||
313 | |||
314 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) | ||
315 | { | ||
316 | UserAccountData[] d = m_Database.GetUsersWhere(scopeID, where); | ||
298 | 317 | ||
299 | if (d == null) | 318 | if (d == null) |
300 | return new List<UserAccount>(); | 319 | return new List<UserAccount>(); |