diff options
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 8b8a8f9..dbf5ef4 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -163,6 +163,10 @@ namespace OpenSim.Services.UserAccountService | |||
163 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); | 163 | Int32.TryParse(d.Data["UserLevel"], out u.UserLevel); |
164 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) | 164 | if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null) |
165 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); | 165 | Int32.TryParse(d.Data["UserFlags"], out u.UserFlags); |
166 | if (d.Data.ContainsKey("UserCountry") && d.Data["UserCountry"] != null) | ||
167 | u.UserCountry = d.Data["UserCountry"].ToString(); | ||
168 | else | ||
169 | u.UserTitle = string.Empty; | ||
166 | 170 | ||
167 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) | 171 | if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null) |
168 | { | 172 | { |
@@ -297,6 +301,21 @@ namespace OpenSim.Services.UserAccountService | |||
297 | return ret; | 301 | return ret; |
298 | } | 302 | } |
299 | 303 | ||
304 | public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) | ||
305 | { | ||
306 | UserAccountData[] d = m_Database.GetUsersWhere(scopeID, where); | ||
307 | |||
308 | if (d == null) | ||
309 | return new List<UserAccount>(); | ||
310 | |||
311 | List<UserAccount> ret = new List<UserAccount>(); | ||
312 | |||
313 | foreach (UserAccountData data in d) | ||
314 | ret.Add(MakeUserAccount(data)); | ||
315 | |||
316 | return ret; | ||
317 | } | ||
318 | |||
300 | #endregion | 319 | #endregion |
301 | 320 | ||
302 | #region Console commands | 321 | #region Console commands |