aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:28:23 +0100
committerMelanie2011-10-11 21:28:23 +0100
commit8fac7c065088d9861ba2ff772fde7f2e9c8d1003 (patch)
tree715c078c3a0ad1298b6b560cf31c2d445c22700a /OpenSim/Services
parentMerge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge (diff)
parentCorrectly create a freshly created estate owner's default items and avatar en... (diff)
downloadopensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.zip
opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.gz
opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.bz2
opensim-SC_OLD-8fac7c065088d9861ba2ff772fde7f2e9c8d1003.tar.xz
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 5f388a4..961698c 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Services.UserAccountService
475 /// <param name="lastName"></param> 475 /// <param name="lastName"></param>
476 /// <param name="password"></param> 476 /// <param name="password"></param>
477 /// <param name="email"></param> 477 /// <param name="email"></param>
478 private void CreateUser(string firstName, string lastName, string password, string email) 478 public UserAccount CreateUser(string firstName, string lastName, string password, string email)
479 { 479 {
480 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); 480 UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
481 if (null == account) 481 if (null == account)
@@ -543,6 +543,8 @@ namespace OpenSim.Services.UserAccountService
543 { 543 {
544 m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); 544 m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName);
545 } 545 }
546
547 return account;
546 } 548 }
547 549
548 private void CreateDefaultAppearanceEntries(UUID principalID) 550 private void CreateDefaultAppearanceEntries(UUID principalID)