Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge

avinationmerge
Melanie 2011-10-25 02:56:15 +01:00
commit e1ff72209f
1 changed files with 3 additions and 3 deletions

View File

@ -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();