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

Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge

avinationmerge
Melanie 2011-10-25 01:51:37 +01:00
parent 2895789bd0 83c7b9b609
commit fe014a05ac
1 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,6 @@ namespace OpenSim.Services.UserAccountService
if (userConfig == null) if (userConfig == null)
throw new Exception("No UserAccountService configuration"); throw new Exception("No UserAccountService configuration");
// In case there are several instances of this class in the same process,
// the console commands are only registered for the root instance
if (m_RootInstance == null)
{
m_RootInstance = this; m_RootInstance = this;
string gridServiceDll = userConfig.GetString("GridService", string.Empty); string gridServiceDll = userConfig.GetString("GridService", string.Empty);
if (gridServiceDll != string.Empty) if (gridServiceDll != string.Empty)
@ -89,8 +85,11 @@ namespace OpenSim.Services.UserAccountService
m_CreateDefaultAvatarEntries = userConfig.GetBoolean("CreateDefaultAvatarEntries", false); m_CreateDefaultAvatarEntries = userConfig.GetBoolean("CreateDefaultAvatarEntries", false);
if (MainConsole.Instance != null) // In case there are several instances of this class in the same process,
// the console commands are only registered for the root instance
if (m_RootInstance == null && MainConsole.Instance != null)
{ {
m_RootInstance = this;
MainConsole.Instance.Commands.AddCommand("UserService", false, MainConsole.Instance.Commands.AddCommand("UserService", false,
"create user", "create user",
"create user [<first> [<last> [<pass> [<email> [<user id>]]]]]", "create user [<first> [<last> [<pass> [<email> [<user id>]]]]]",
@ -115,7 +114,6 @@ namespace OpenSim.Services.UserAccountService
"Show account details for the given user", HandleShowAccount); "Show account details for the given user", HandleShowAccount);
} }
} }
}
#region IUserAccountService #region IUserAccountService