diff options
author | Justin Clark-Casey (justincc) | 2011-09-16 00:12:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-16 00:12:12 +0100 |
commit | 522d6261f11ffaf8320c3f0775beb5d0608ce226 (patch) | |
tree | 156395f407ca56551784aa630b53286d14bbcf32 /OpenSim/Services | |
parent | Write code to create minimum necessary body parts/clothing and avatar entries... (diff) | |
download | opensim-SC-522d6261f11ffaf8320c3f0775beb5d0608ce226.zip opensim-SC-522d6261f11ffaf8320c3f0775beb5d0608ce226.tar.gz opensim-SC-522d6261f11ffaf8320c3f0775beb5d0608ce226.tar.bz2 opensim-SC-522d6261f11ffaf8320c3f0775beb5d0608ce226.tar.xz |
Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 21ce86c..0acfdcf 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -456,7 +456,7 @@ namespace OpenSim.Services.UserAccountService | |||
456 | /// <param name="lastName"></param> | 456 | /// <param name="lastName"></param> |
457 | /// <param name="password"></param> | 457 | /// <param name="password"></param> |
458 | /// <param name="email"></param> | 458 | /// <param name="email"></param> |
459 | private void CreateUser(string firstName, string lastName, string password, string email) | 459 | public UserAccount CreateUser(string firstName, string lastName, string password, string email) |
460 | { | 460 | { |
461 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); | 461 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); |
462 | if (null == account) | 462 | if (null == account) |
@@ -524,6 +524,8 @@ namespace OpenSim.Services.UserAccountService | |||
524 | { | 524 | { |
525 | m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); | 525 | m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); |
526 | } | 526 | } |
527 | |||
528 | return account; | ||
527 | } | 529 | } |
528 | 530 | ||
529 | private void CreateDefaultAppearanceEntries(UUID principalID) | 531 | private void CreateDefaultAppearanceEntries(UUID principalID) |