Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge

This commit is contained in:
Melanie
2011-10-12 01:30:14 +01:00
4 changed files with 28 additions and 8 deletions

View File

@@ -540,9 +540,18 @@ namespace OpenSim
string password = MainConsole.Instance.PasswdPrompt("Password");
string email = MainConsole.Instance.CmdPrompt("Email", "");
string rawPrincipalId = MainConsole.Instance.CmdPrompt("ID", UUID.Random().ToString());
UUID principalId = UUID.Zero;
if (!UUID.TryParse(rawPrincipalId, out principalId))
{
m_log.ErrorFormat("[OPENSIM]: ID {0} is not a valid UUID", rawPrincipalId);
return;
}
account
= ((UserAccountService)scene.UserAccountService).CreateUser(
regionInfo.ScopeID, first, last, password, email);
regionInfo.ScopeID, principalId, first, last, password, email);
}
// }
}