diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Services/UserAccountService | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
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 2e19ece..987a07d 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -176,6 +176,10 @@ namespace OpenSim.Services.UserAccountService | |||
176 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); | 176 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); |
177 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) | 177 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) |
178 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); | 178 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); |
179 | if (d.Data.ContainsKey("UserCountry") && d.Data["UserCountry"] != null) | ||
180 | u.UserCountry = d.Data["UserCountry"].ToString(); | ||
181 | else | ||
182 | u.UserTitle = string.Empty; | ||
179 | 183 | ||
180 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) | 184 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) |
181 | { | 185 | { |
@@ -301,7 +305,22 @@ namespace OpenSim.Services.UserAccountService | |||
301 | 305 | ||
302 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) | 306 | public List<UserAccount> GetUserAccounts(UUID scopeID, string query) |
303 | { | 307 | { |
304 | UserAccountData[] d = m_Database.GetUsers(scopeID, query); | 308 | UserAccountData[] d = m_Database.GetUsers(scopeID, query.Trim()); |
309 | |||
310 | if (d == null) | ||
311 | return new List<UserAccount>(); | ||
312 | |||
313 | List<UserAccount> ret = new List<UserAccount>(); | ||
314 | |||
315 | foreach (UserAccountData data in d) | ||
316 | ret.Add(MakeUserAccount(data)); | ||
317 | |||
318 | return ret; | ||
319 | } | ||
320 | |||
321 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) | ||
322 | { | ||
323 | UserAccountData[] d = m_Database.GetUsersWhere(scopeID, where); | ||
305 | 324 | ||
306 | if (d == null) | 325 | if (d == null) |
307 | return new List<UserAccount>(); | 326 | return new List<UserAccount>(); |