From 9f171041c950d55d86481cdcee7a04c623bea8b2 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 19 Oct 2011 00:23:06 +0100 Subject: [PATCH] Make PrincipalID a synonym for UserID in GetUserAccount --- .../Handlers/UserAccounts/UserAccountServerPostHandler.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index 7439cb0c5c..32da44f2ed 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs @@ -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());