ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-10-25 02:56:22 +01:00
parent e1ff72209f 9f171041c9
commit 3555987fe9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
View File

@@ -144,6 +144,12 @@ namespace OpenSim.Server.Handlers.UserAccounts
if (UUID.TryParse(request["UserID"].ToString(), out 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)
{
account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString());