diff options
author | Dan Lake | 2011-10-04 16:59:35 -0700 |
---|---|---|
committer | Dan Lake | 2011-10-04 16:59:35 -0700 |
commit | 38d205502a83ed334d9827f43862579cec305639 (patch) | |
tree | 31358ac05557104e6e821309a9c68dd7b3151032 /OpenSim/Region | |
parent | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ob... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.zip opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.gz opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.bz2 opensim-SC_OLD-38d205502a83ed334d9827f43862579cec305639.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 866ba9a..a6b91a3 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -462,9 +462,18 @@ 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()); | ||
466 | |||
467 | UUID principalId = UUID.Zero; | ||
468 | if (!UUID.TryParse(rawPrincipalId, out principalId)) | ||
469 | { | ||
470 | m_log.ErrorFormat("[OPENSIM]: ID {0} is not a valid UUID", rawPrincipalId); | ||
471 | return; | ||
472 | } | ||
473 | |||
465 | account | 474 | account |
466 | = ((UserAccountService)scene.UserAccountService).CreateUser( | 475 | = ((UserAccountService)scene.UserAccountService).CreateUser( |
467 | regionInfo.ScopeID, first, last, password, email); | 476 | regionInfo.ScopeID, principalId, first, last, password, email); |
468 | } | 477 | } |
469 | // } | 478 | // } |
470 | } | 479 | } |