diff options
| author | Melanie | 2013-04-02 23:47:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-02 23:47:19 +0100 |
| commit | 41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch) | |
| tree | c5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff) | |
| download | opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2 opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index 4ef57fe..8ce20e9 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
| @@ -50,12 +50,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
| 50 | { | 50 | { |
| 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 52 | 52 | ||
| 53 | |||
| 54 | #region ISharedRegionModule | 53 | #region ISharedRegionModule |
| 55 | 54 | ||
| 56 | public new void Initialise(IConfigSource config) | 55 | public new void Initialise(IConfigSource config) |
| 57 | { | 56 | { |
| 58 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name); | 57 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name); |
| 59 | if (umanmod == Name) | 58 | if (umanmod == Name) |
| 60 | { | 59 | { |
| 61 | m_Enabled = true; | 60 | m_Enabled = true; |