Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
commit
77f9d98831
|
@ -540,7 +540,7 @@ namespace OpenSim
|
||||||
string password = MainConsole.Instance.PasswdPrompt("Password");
|
string password = MainConsole.Instance.PasswdPrompt("Password");
|
||||||
string email = MainConsole.Instance.CmdPrompt("Email", "");
|
string email = MainConsole.Instance.CmdPrompt("Email", "");
|
||||||
|
|
||||||
string rawPrincipalId = MainConsole.Instance.CmdPrompt("ID", UUID.Random().ToString());
|
string rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
|
||||||
|
|
||||||
UUID principalId = UUID.Zero;
|
UUID principalId = UUID.Zero;
|
||||||
if (!UUID.TryParse(rawPrincipalId, out principalId))
|
if (!UUID.TryParse(rawPrincipalId, out principalId))
|
||||||
|
|
Loading…
Reference in New Issue