Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-19 00:16:53 +01:00
parent 9d59b285bb
commit 97c66f8eac
1 changed files with 3 additions and 3 deletions

View File

@ -108,7 +108,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
else else
break; break;
} }
m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method); m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method);
} }
catch (Exception e) catch (Exception e)
@ -202,7 +202,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
byte[] StoreAccount(Dictionary<string, object> request) byte[] StoreAccount(Dictionary<string, object> request)
{ {
UUID principalID = UUID.Zero; 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(); return FailureResult();
UUID scopeID = UUID.Zero; UUID scopeID = UUID.Zero;
@ -268,7 +268,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
return FailureResult(); return FailureResult();
UUID principalID = UUID.Random(); 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(); return FailureResult();
string firstName = request["FirstName"].ToString(); string firstName = request["FirstName"].ToString();