aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-19 00:23:06 +0100
committerJustin Clark-Casey (justincc)2011-10-19 00:23:06 +0100
commit9f171041c950d55d86481cdcee7a04c623bea8b2 (patch)
tree7375a832e1039b04b9d0ab6de69a50878502dbcd /OpenSim/Server
parentGet new NewUser and SetUserAccount calls to accept PrincipalID instead of Use... (diff)
downloadopensim-SC_OLD-9f171041c950d55d86481cdcee7a04c623bea8b2.zip
opensim-SC_OLD-9f171041c950d55d86481cdcee7a04c623bea8b2.tar.gz
opensim-SC_OLD-9f171041c950d55d86481cdcee7a04c623bea8b2.tar.bz2
opensim-SC_OLD-9f171041c950d55d86481cdcee7a04c623bea8b2.tar.xz
Make PrincipalID a synonym for UserID in GetUserAccount
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs6
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());