diff options
author | Melanie | 2010-06-14 02:49:15 +0100 |
---|---|---|
committer | Melanie | 2010-06-14 02:49:15 +0100 |
commit | fdf648bcf3cecc2236cc6761d33f3df5e0af136d (patch) | |
tree | db65a301f98b6b998a901cdd887fec755e6d73dd /OpenSim/Services/UserAccountService | |
parent | D.U.H. #2. Inverted test. Again. Argh! (diff) | |
parent | Fixes attachments coming back upon being detached in neighbouring regions and... (diff) | |
download | opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.zip opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.gz opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.bz2 opensim-SC-fdf648bcf3cecc2236cc6761d33f3df5e0af136d.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/UserAccountService')
-rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 063251a..326e502 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
@@ -357,7 +357,7 @@ namespace OpenSim.Services.UserAccountService | |||
357 | /// <param name="lastName"></param> | 357 | /// <param name="lastName"></param> |
358 | /// <param name="password"></param> | 358 | /// <param name="password"></param> |
359 | /// <param name="email"></param> | 359 | /// <param name="email"></param> |
360 | public void CreateUser(string firstName, string lastName, string password, string email) | 360 | private void CreateUser(string firstName, string lastName, string password, string email) |
361 | { | 361 | { |
362 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); | 362 | UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); |
363 | if (null == account) | 363 | if (null == account) |
@@ -374,12 +374,14 @@ namespace OpenSim.Services.UserAccountService | |||
374 | 374 | ||
375 | if (StoreUserAccount(account)) | 375 | if (StoreUserAccount(account)) |
376 | { | 376 | { |
377 | bool success = false; | 377 | bool success; |
378 | if (m_AuthenticationService != null) | 378 | if (m_AuthenticationService != null) |
379 | { | ||
379 | success = m_AuthenticationService.SetPassword(account.PrincipalID, password); | 380 | success = m_AuthenticationService.SetPassword(account.PrincipalID, password); |
380 | if (!success) | 381 | if (!success) |
381 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set password for account {0} {1}.", | 382 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set password for account {0} {1}.", |
382 | firstName, lastName); | 383 | firstName, lastName); |
384 | } | ||
383 | 385 | ||
384 | GridRegion home = null; | 386 | GridRegion home = null; |
385 | if (m_GridService != null) | 387 | if (m_GridService != null) |
@@ -399,18 +401,22 @@ namespace OpenSim.Services.UserAccountService | |||
399 | firstName, lastName); | 401 | firstName, lastName); |
400 | 402 | ||
401 | if (m_InventoryService != null) | 403 | if (m_InventoryService != null) |
404 | { | ||
402 | success = m_InventoryService.CreateUserInventory(account.PrincipalID); | 405 | success = m_InventoryService.CreateUserInventory(account.PrincipalID); |
403 | if (!success) | 406 | if (!success) |
404 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.", | 407 | m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.", |
405 | firstName, lastName); | 408 | firstName, lastName); |
409 | } | ||
406 | 410 | ||
407 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); | 411 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); |
412 | } else { | ||
413 | m_log.ErrorFormat("[USER ACCOUNT SERVICE]: Account creation failed for account {0} {1}", firstName, lastName); | ||
408 | } | 414 | } |
409 | } | 415 | } |
410 | else | 416 | else |
411 | { | 417 | { |
412 | m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); | 418 | m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); |
413 | } | 419 | } |
414 | } | 420 | } |
415 | } | 421 | } |
416 | } | 422 | } |