aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-05-23 23:05:56 +0100
committerJustin Clark-Casey (justincc)2013-05-23 23:05:56 +0100
commit28548ab347487b1ed4e6cf50af30a6eacf963f7d (patch)
tree7dc3ab185c0efebf840a9cedca144fe193b5279b
parentImplement llSetSoundQueueing(). (diff)
downloadopensim-SC_OLD-28548ab347487b1ed4e6cf50af30a6eacf963f7d.zip
opensim-SC_OLD-28548ab347487b1ed4e6cf50af30a6eacf963f7d.tar.gz
opensim-SC_OLD-28548ab347487b1ed4e6cf50af30a6eacf963f7d.tar.bz2
opensim-SC_OLD-28548ab347487b1ed4e6cf50af30a6eacf963f7d.tar.xz
Fix bug where both ordinary UserManagementModule and HGUserManagementModules were being added to scenes if no UserManagementModule was specified.
Without explicit config non-hg UMM is used - this is in common with other HG modules. This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs2
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;