Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'

avinationmerge
Melanie Thielker 2014-06-21 00:22:51 +02:00
commit 5908e7d0c2
1 changed files with 1 additions and 2 deletions

View File

@ -50,12 +50,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region ISharedRegionModule #region ISharedRegionModule
public new void Initialise(IConfigSource config) public new void Initialise(IConfigSource config)
{ {
string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name); string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name);
if (umanmod == Name) if (umanmod == Name)
{ {
m_Enabled = true; m_Enabled = true;