diff options
| author | Melanie Thielker | 2014-06-21 00:22:51 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:22:51 +0200 |
| commit | 5908e7d0c263230248b004151d949748afd3e3a0 (patch) | |
| tree | b31a83b8dce0307d5993004a43a1cccb5776a175 | |
| parent | Merge commit '600087ab49e9489e37471ccfb7360ac14d31b7f2' (diff) | |
| parent | minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.Updat... (diff) | |
| download | opensim-SC-5908e7d0c263230248b004151d949748afd3e3a0.zip opensim-SC-5908e7d0c263230248b004151d949748afd3e3a0.tar.gz opensim-SC-5908e7d0c263230248b004151d949748afd3e3a0.tar.bz2 opensim-SC-5908e7d0c263230248b004151d949748afd3e3a0.tar.xz | |
Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'
Diffstat (limited to '')
| -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; |