Make PrincipalID a synonym for UserID in GetUserAccount

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-10-19 00:23:06 +01:00
parent aad13a4c76
commit eb65f5072d
1 changed files with 6 additions and 0 deletions

View File

@ -144,6 +144,12 @@ namespace OpenSim.Server.Handlers.UserAccounts
if (UUID.TryParse(request["UserID"].ToString(), out userID)) if (UUID.TryParse(request["UserID"].ToString(), out userID))
account = m_UserAccountService.GetUserAccount(scopeID, userID); account = m_UserAccountService.GetUserAccount(scopeID, userID);
} }
else if (request.ContainsKey("PrincipalID") && request["PrincipalID"] != null)
{
UUID userID;
if (UUID.TryParse(request["PrincipalID"].ToString(), out userID))
account = m_UserAccountService.GetUserAccount(scopeID, userID);
}
else if (request.ContainsKey("Email") && request["Email"] != null) else if (request.ContainsKey("Email") && request["Email"] != null)
{ {
account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString()); account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString());