aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2011-10-12 01:30:14 +0100
committerMelanie2011-10-12 01:30:14 +0100
commit6af388ded9958b889700d8c3fc1d9f266cdf8759 (patch)
tree18289983c7f20e63e2ae8894b00324888515e202 /OpenSim/Region/Application
parentMerge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge (diff)
parentWhen creating a new user on the comand line, give the option of allowing a UU... (diff)
downloadopensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.zip
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.gz
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.bz2
opensim-SC_OLD-6af388ded9958b889700d8c3fc1d9f266cdf8759.tar.xz
Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 77f38ed..3e58287 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -540,9 +540,18 @@ 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());
544
545 UUID principalId = UUID.Zero;
546 if (!UUID.TryParse(rawPrincipalId, out principalId))
547 {
548 m_log.ErrorFormat("[OPENSIM]: ID {0} is not a valid UUID", rawPrincipalId);
549 return;
550 }
551
543 account 552 account
544 = ((UserAccountService)scene.UserAccountService).CreateUser( 553 = ((UserAccountService)scene.UserAccountService).CreateUser(
545 regionInfo.ScopeID, first, last, password, email); 554 regionInfo.ScopeID, principalId, first, last, password, email);
546 } 555 }
547// } 556// }
548 } 557 }