diff options
| author | Dan Lake | 2011-10-06 12:22:15 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-10-06 12:22:15 -0700 |
| commit | 08f264d096e1dca535a64e683fa5ab5918368085 (patch) | |
| tree | 0e898f21be0cca8a6249f78e534c9ec3a98528e2 /OpenSim/Region/Application | |
| parent | Refactor ScenePresence so gets and sets are through properties. Added private... (diff) | |
| parent | Added back UserAccount that creates random UUID for new account. (diff) | |
| download | opensim-SC-08f264d096e1dca535a64e683fa5ab5918368085.zip opensim-SC-08f264d096e1dca535a64e683fa5ab5918368085.tar.gz opensim-SC-08f264d096e1dca535a64e683fa5ab5918368085.tar.bz2 opensim-SC-08f264d096e1dca535a64e683fa5ab5918368085.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -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 a6b91a3..6fba71e 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -462,7 +462,7 @@ namespace OpenSim | |||
| 462 | string password = MainConsole.Instance.PasswdPrompt("Password"); | 462 | string password = MainConsole.Instance.PasswdPrompt("Password"); |
| 463 | string email = MainConsole.Instance.CmdPrompt("Email", ""); | 463 | string email = MainConsole.Instance.CmdPrompt("Email", ""); |
| 464 | 464 | ||
| 465 | string rawPrincipalId = MainConsole.Instance.CmdPrompt("ID", UUID.Random().ToString()); | 465 | string rawPrincipalId = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString()); |
| 466 | 466 | ||
| 467 | UUID principalId = UUID.Zero; | 467 | UUID principalId = UUID.Zero; |
| 468 | if (!UUID.TryParse(rawPrincipalId, out principalId)) | 468 | if (!UUID.TryParse(rawPrincipalId, out principalId)) |