aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:55:57 +0100
committerMelanie2011-10-25 02:55:57 +0100
commitf5e2bdebef804d25ee36b63903371632c990241e (patch)
treeeed67903acace2bddba265c8bed6dbb6cd332235 /OpenSim/Services
parentMerge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge (diff)
parentProvide an option to allow remote calls to the CreateUser method on the UserA... (diff)
downloadopensim-SC_OLD-f5e2bdebef804d25ee36b63903371632c990241e.zip
opensim-SC_OLD-f5e2bdebef804d25ee36b63903371632c990241e.tar.gz
opensim-SC_OLD-f5e2bdebef804d25ee36b63903371632c990241e.tar.bz2
opensim-SC_OLD-f5e2bdebef804d25ee36b63903371632c990241e.tar.xz
Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 4ef6410..ad06300 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -524,8 +524,10 @@ namespace OpenSim.Services.UserAccountService
524 firstName, lastName); 524 firstName, lastName);
525 } 525 }
526 else 526 else
527 {
527 m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.", 528 m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to retrieve home region for account {0} {1}.",
528 firstName, lastName); 529 firstName, lastName);
530 }
529 531
530 if (m_InventoryService != null) 532 if (m_InventoryService != null)
531 { 533 {
@@ -535,13 +537,19 @@ namespace OpenSim.Services.UserAccountService
535 m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.", 537 m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.",
536 firstName, lastName); 538 firstName, lastName);
537 } 539 }
538 else if (m_CreateDefaultAvatarEntries) 540 else
539 { 541 {
540 CreateDefaultAppearanceEntries(account.PrincipalID); 542 m_log.DebugFormat(
543 "[USER ACCOUNT SERVICE]; Created user inventory for {0} {1}", firstName, lastName);
541 } 544 }
545
546 if (m_CreateDefaultAvatarEntries)
547 CreateDefaultAppearanceEntries(account.PrincipalID);
542 } 548 }
543 549
544 m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); 550 m_log.InfoFormat(
551 "[USER ACCOUNT SERVICE]: Account {0} {1} {2} created successfully",
552 firstName, lastName, account.PrincipalID);
545 } 553 }
546 else 554 else
547 { 555 {