diff options
author | Justin Clark-Casey (justincc) | 2011-09-16 00:36:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-16 00:36:43 +0100 |
commit | 90466515839eb34d7fd9984c92f1970ab5d6f3ad (patch) | |
tree | f034982a17d72c6394383960b02d21c1df960f62 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | On standalone, by default create the necessary minimum body parts and clothes... (diff) | |
download | opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.zip opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.gz opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.bz2 opensim-SC_OLD-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.xz |
Pass any region scope through to the CreateUser() method
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 8662ea8..54caac4 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -422,6 +422,14 @@ namespace OpenSim | |||
422 | return clientServer; | 422 | return clientServer; |
423 | } | 423 | } |
424 | 424 | ||
425 | /// <summary> | ||
426 | /// Try to set up the estate owner for the given scene. | ||
427 | /// </summary> | ||
428 | /// <remarks> | ||
429 | /// The involves asking the user for information about the user on the console. If the user does not already | ||
430 | /// exist then it is created. | ||
431 | /// </remarks> | ||
432 | /// <param name="scene"></param> | ||
425 | private void SetUpEstateOwner(Scene scene) | 433 | private void SetUpEstateOwner(Scene scene) |
426 | { | 434 | { |
427 | RegionInfo regionInfo = scene.RegionInfo; | 435 | RegionInfo regionInfo = scene.RegionInfo; |
@@ -453,8 +461,9 @@ namespace OpenSim | |||
453 | string password = MainConsole.Instance.PasswdPrompt("Password"); | 461 | string password = MainConsole.Instance.PasswdPrompt("Password"); |
454 | string email = MainConsole.Instance.CmdPrompt("Email", ""); | 462 | string email = MainConsole.Instance.CmdPrompt("Email", ""); |
455 | 463 | ||
456 | // TODO: Where do we put m_regInfo.ScopeID? | 464 | account |
457 | account = ((UserAccountService)scene.UserAccountService).CreateUser(first, last, password, email); | 465 | = ((UserAccountService)scene.UserAccountService).CreateUser( |
466 | regionInfo.ScopeID, first, last, password, email); | ||
458 | } | 467 | } |
459 | // } | 468 | // } |
460 | } | 469 | } |