From 97c66f8eac648229b55ba5a000d57e4b9377c663 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 19 Oct 2011 00:16:53 +0100 Subject: Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output --- .../Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index aba4f7b..7439cb0 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs @@ -108,7 +108,7 @@ namespace OpenSim.Server.Handlers.UserAccounts else break; } - + m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); } catch (Exception e) @@ -202,7 +202,7 @@ namespace OpenSim.Server.Handlers.UserAccounts byte[] StoreAccount(Dictionary request) { UUID principalID = UUID.Zero; - if (!(request.ContainsKey("UserID") && UUID.TryParse(request["UserID"].ToString(), out principalID))) + if (!(request.ContainsKey("PrincipalID") && UUID.TryParse(request["PrincipalID"].ToString(), out principalID))) return FailureResult(); UUID scopeID = UUID.Zero; @@ -268,7 +268,7 @@ namespace OpenSim.Server.Handlers.UserAccounts return FailureResult(); UUID principalID = UUID.Random(); - if (request.ContainsKey("UserID") && !UUID.TryParse(request["UserID"].ToString(), out principalID)) + if (request.ContainsKey("PrincipalID") && !UUID.TryParse(request["PrincipalID"].ToString(), out principalID)) return FailureResult(); string firstName = request["FirstName"].ToString(); -- cgit v1.1