diff options
| author | Melanie | 2011-10-25 02:56:22 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:56:22 +0100 |
| commit | 3555987fe99f16206656a3b9cb9fdb65e215b2ce (patch) | |
| tree | 27d31c01a72528c57888690bafe9cc180b968a7e | |
| parent | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge (diff) | |
| parent | Make PrincipalID a synonym for UserID in GetUserAccount (diff) | |
| download | opensim-SC_OLD-3555987fe99f16206656a3b9cb9fdb65e215b2ce.zip opensim-SC_OLD-3555987fe99f16206656a3b9cb9fdb65e215b2ce.tar.gz opensim-SC_OLD-3555987fe99f16206656a3b9cb9fdb65e215b2ce.tar.bz2 opensim-SC_OLD-3555987fe99f16206656a3b9cb9fdb65e215b2ce.tar.xz | |
Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge
| -rw-r--r-- | OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index 7439cb0..32da44f 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
| @@ -144,6 +144,12 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
| 144 | if (UUID.TryParse(request["UserID"].ToString(), out userID)) | 144 | if (UUID.TryParse(request["UserID"].ToString(), out userID)) |
| 145 | account = m_UserAccountService.GetUserAccount(scopeID, userID); | 145 | account = m_UserAccountService.GetUserAccount(scopeID, userID); |
| 146 | } | 146 | } |
| 147 | else if (request.ContainsKey("PrincipalID") && request["PrincipalID"] != null) | ||
| 148 | { | ||
| 149 | UUID userID; | ||
| 150 | if (UUID.TryParse(request["PrincipalID"].ToString(), out userID)) | ||
| 151 | account = m_UserAccountService.GetUserAccount(scopeID, userID); | ||
| 152 | } | ||
| 147 | else if (request.ContainsKey("Email") && request["Email"] != null) | 153 | else if (request.ContainsKey("Email") && request["Email"] != null) |
| 148 | { | 154 | { |
| 149 | account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString()); | 155 | account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString()); |