OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following 

changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
soprefactor
Melanie 2010-06-13 21:45:39 +01:00
parent eff641ab83
commit 14c587bea1
3 changed files with 620 additions and 347 deletions
OpenSim
ApplicationPlugins/RemoteController
Services
Connectors/SimianGrid
UserAccountService

941
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

File diff suppressed because it is too large Load Diff

2
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *

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

@ -357,7 +357,7 @@ namespace OpenSim.Services.UserAccountService
/// <param name="lastName"></param> /// <param name="lastName"></param>
/// <param name="password"></param> /// <param name="password"></param>
/// <param name="email"></param> /// <param name="email"></param>
public void CreateUser(string firstName, string lastName, string password, string email) private void CreateUser(string firstName, string lastName, string password, string email)
{ {
UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName); UserAccount account = GetUserAccount(UUID.Zero, firstName, lastName);
if (null == account) if (null == account)
@ -374,12 +374,14 @@ namespace OpenSim.Services.UserAccountService
if (StoreUserAccount(account)) if (StoreUserAccount(account))
{ {
bool success = false; bool success;
if (m_AuthenticationService != null) if (m_AuthenticationService != null)
{
success = m_AuthenticationService.SetPassword(account.PrincipalID, password); success = m_AuthenticationService.SetPassword(account.PrincipalID, password);
if (!success) if (!success)
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set password for account {0} {1}.", m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to set password for account {0} {1}.",
firstName, lastName); firstName, lastName);
}
GridRegion home = null; GridRegion home = null;
if (m_GridService != null) if (m_GridService != null)
@ -399,18 +401,22 @@ namespace OpenSim.Services.UserAccountService
firstName, lastName); firstName, lastName);
if (m_InventoryService != null) if (m_InventoryService != null)
{
success = m_InventoryService.CreateUserInventory(account.PrincipalID); success = m_InventoryService.CreateUserInventory(account.PrincipalID);
if (!success) if (!success)
m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.", m_log.WarnFormat("[USER ACCOUNT SERVICE]: Unable to create inventory for account {0} {1}.",
firstName, lastName); firstName, lastName);
}
m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName); m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", firstName, lastName);
} else {
m_log.ErrorFormat("[USER ACCOUNT SERVICE]: Account creation failed for account {0} {1}", firstName, lastName);
} }
} }
else else
{ {
m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName); m_log.ErrorFormat("[USER ACCOUNT SERVICE]: A user with the name {0} {1} already exists!", firstName, lastName);
} }
} }
} }
} }