diff options
| author | Melanie | 2011-10-12 01:41:59 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 01:41:59 +0100 |
| commit | 77f9d988316c5d6e7d1c3be81e338ad8db44551d (patch) | |
| tree | cf17e6f7fa506176e78ca74c3fcc78259c6c4fab /OpenSim | |
| parent | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge (diff) | |
| parent | Add user ID to new estate user prompt, to make it clearer and consistent with... (diff) | |
| download | opensim-SC_OLD-77f9d988316c5d6e7d1c3be81e338ad8db44551d.zip opensim-SC_OLD-77f9d988316c5d6e7d1c3be81e338ad8db44551d.tar.gz opensim-SC_OLD-77f9d988316c5d6e7d1c3be81e338ad8db44551d.tar.bz2 opensim-SC_OLD-77f9d988316c5d6e7d1c3be81e338ad8db44551d.tar.xz | |
Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3e58287..7df974b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -540,7 +540,7 @@ namespace OpenSim | |||
| 540 | string password = MainConsole.Instance.PasswdPrompt("Password"); | 540 | string password = MainConsole.Instance.PasswdPrompt("Password"); |
| 541 | string email = MainConsole.Instance.CmdPrompt("Email", ""); | 541 | string email = MainConsole.Instance.CmdPrompt("Email", ""); |
| 542 | 542 | ||
| 543 | string rawPrincipalId = MainConsole.Instance.CmdPrompt("ID", UUID.Random().ToString()); | 543 | string rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString()); |
| 544 | 544 | ||
| 545 | UUID principalId = UUID.Zero; | 545 | UUID principalId = UUID.Zero; |
| 546 | if (!UUID.TryParse(rawPrincipalId, out principalId)) | 546 | if (!UUID.TryParse(rawPrincipalId, out principalId)) |