diff options
author | Justin Clark-Casey (justincc) | 2012-01-03 18:22:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-03 18:22:14 +0000 |
commit | 01eacd3a314b866ce8c6b60f4b1e5643ac96cb65 (patch) | |
tree | c27315f31043460626f1433ad5028a7e2093dfe8 /OpenSim/Services/HypergridService/UserAgentService.cs | |
parent | minor: add missing newlines to pCampbot usage statement (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-01eacd3a314b866ce8c6b60f4b1e5643ac96cb65.zip opensim-SC_OLD-01eacd3a314b866ce8c6b60f4b1e5643ac96cb65.tar.gz opensim-SC_OLD-01eacd3a314b866ce8c6b60f4b1e5643ac96cb65.tar.bz2 opensim-SC_OLD-01eacd3a314b866ce8c6b60f4b1e5643ac96cb65.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 8538660..f681df4 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -488,6 +488,31 @@ namespace OpenSim.Services.HypergridService | |||
488 | return online; | 488 | return online; |
489 | } | 489 | } |
490 | 490 | ||
491 | public Dictionary<string, object> GetUserInfo(UUID userID) | ||
492 | { | ||
493 | Dictionary<string, object> info = new Dictionary<string, object>(); | ||
494 | |||
495 | if (m_UserAccountService == null) | ||
496 | { | ||
497 | m_log.WarnFormat("[USER AGENT SERVICE]: Unable to get user flags because user account service is missing"); | ||
498 | info["result"] = "fail"; | ||
499 | info["message"] = "UserAccountService is missing!"; | ||
500 | return info; | ||
501 | } | ||
502 | |||
503 | UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero /*!!!*/, userID); | ||
504 | |||
505 | if (account != null) | ||
506 | { | ||
507 | info.Add("user_flags", (object)account.UserFlags); | ||
508 | info.Add("user_created", (object)account.Created); | ||
509 | info.Add("user_title", (object)account.UserTitle); | ||
510 | info.Add("result", "success"); | ||
511 | } | ||
512 | |||
513 | return info; | ||
514 | } | ||
515 | |||
491 | public Dictionary<string, object> GetServerURLs(UUID userID) | 516 | public Dictionary<string, object> GetServerURLs(UUID userID) |
492 | { | 517 | { |
493 | if (m_UserAccountService == null) | 518 | if (m_UserAccountService == null) |