diff options
| author | Melanie | 2013-05-24 01:11:49 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-24 01:11:49 +0100 |
| commit | e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f (patch) | |
| tree | 1c9b02e48835c85a84b85d690428bf65adfe7fd9 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff) | |
| download | opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.zip opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.gz opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.bz2 opensim-SC-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index fac93e6..ad3cf15 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
| 54 | 54 | ||
| 55 | public new void Initialise(IConfigSource config) | 55 | public new void Initialise(IConfigSource config) |
| 56 | { | 56 | { |
| 57 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name); | 57 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", null); |
| 58 | if (umanmod == Name) | 58 | if (umanmod == Name) |
| 59 | { | 59 | { |
| 60 | m_Enabled = true; | 60 | m_Enabled = true; |