aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2013-01-19 13:21:43 +0100
committerMelanie2013-01-19 13:21:43 +0100
commit13232718262920101ee50cfbe87192096c5c3805 (patch)
tree17d5d44c78f77658bf9d29b0860fed9dfd013c3f /OpenSim/Region
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-13232718262920101ee50cfbe87192096c5c3805.zip
opensim-SC_OLD-13232718262920101ee50cfbe87192096c5c3805.tar.gz
opensim-SC_OLD-13232718262920101ee50cfbe87192096c5c3805.tar.bz2
opensim-SC_OLD-13232718262920101ee50cfbe87192096c5c3805.tar.xz
Kill the dumb Opensimulator Testing group again - for good.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index af54c1a..d2ef6b1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -73,17 +73,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
73 } 73 }
74 else 74 else
75 { 75 {
76 m_Enabled = groupsConfig.GetBoolean("Enabled", false); 76 if (groupsConfig.GetBoolean("Enabled", false))
77 if (!m_Enabled)
78 { 77 {
79 m_log.Info("[GROUPS]: Groups disabled in configuration"); 78 if (groupsConfig.GetString("Module", "Default") == "Default")
80 return; 79 m_Enabled = true;
81 } 80 }
82
83 if (groupsConfig.GetString("Module", "Default") != "Default")
84 return;
85 } 81 }
86
87 } 82 }
88 83
89 public void AddRegion(Scene scene) 84 public void AddRegion(Scene scene)