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/Services | |
parent | On standalone, by default create the necessary minimum body parts and clothes... (diff) | |
download | opensim-SC-90466515839eb34d7fd9984c92f1970ab5d6f3ad.zip opensim-SC-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.gz opensim-SC-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.bz2 opensim-SC-90466515839eb34d7fd9984c92f1970ab5d6f3ad.tar.xz |
Pass any region scope through to the CreateUser() method
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 0acfdcf..e071b94 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -340,7 +340,7 @@ namespace OpenSim.Services.UserAccountService | |||
340 | email = MainConsole.Instance.CmdPrompt("Email", ""); | 340 | email = MainConsole.Instance.CmdPrompt("Email", ""); |
341 | else email = cmdparams[5]; | 341 | else email = cmdparams[5]; |
342 | 342 | ||
343 | CreateUser(firstName, lastName, password, email); | 343 | CreateUser(UUID.Zero, firstName, lastName, password, email); |
344 | } | 344 | } |
345 | 345 | ||
346 | protected void HandleShowAccount(string module, string[] cmdparams) | 346 | protected void HandleShowAccount(string module, string[] cmdparams) |
@@ -452,11 +452,12 @@ namespace OpenSim.Services.UserAccountService | |||
452 | /// <summary> | 452 | /// <summary> |
453 | /// Create a user | 453 | /// Create a user |
454 | /// </summary> | 454 | /// </summary> |
455 | /// <param name="scopeID">Allows hosting of multiple grids in a single database. Normally left as UUID.Zero</param> | ||
455 | /// <param name="firstName"></param> | 456 | /// <param name="firstName"></param> |
456 | /// <param name="lastName"></param> | 457 | /// <param name="lastName"></param> |
457 | /// <param name="password"></param> | 458 | /// <param name="password"></param> |
458 | /// <param name="email"></param> | 459 | /// <param name="email"></param> |
459 | public UserAccount CreateUser(string firstName, string lastName, string password, string email) | 460 | public UserAccount CreateUser(UUID scopeID, string firstName, string lastName, string password, string email) |
460 | { | 461 | { |
461 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); | 462 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); |
462 | if (null == account) | 463 | if (null == account) |