ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-14 03:15:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
This commit is contained in:
Melanie
2011-10-11 21:28:23 +01:00
parent 9d22110c23 522d6261f1
commit 8fac7c0650
5 changed files with 69 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@@ -475,7 +475,7 @@ namespace OpenSim.Services.UserAccountService
/// <param name="lastName"></param>
/// <param name="password"></param>
/// <param name="email"></param>
private void CreateUser(string firstName, string lastName, string password, string email)
public UserAccount CreateUser(string firstName, string lastName, string password, string email)
{
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
if (null == account)
@@ -543,6 +543,8 @@ namespace OpenSim.Services.UserAccountService
{
m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName);
}
return account;
}
private void CreateDefaultAppearanceEntries(UUID principalID)