aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-28 02:00:34 +0000
committerJustin Clark-Casey (justincc)2012-11-28 02:00:34 +0000
commit8a1d3b322fdd0361412246c55dc390e5f2c4fdba (patch)
tree2d501f09c137a17321fd05b8d4ca0bb85b01c8c7 /OpenSim/Region/CoreModules
parentShow many more primitive properties on console command "show part name/id/pos" (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-8a1d3b322fdd0361412246c55dc390e5f2c4fdba.zip
opensim-SC_OLD-8a1d3b322fdd0361412246c55dc390e5f2c4fdba.tar.gz
opensim-SC_OLD-8a1d3b322fdd0361412246c55dc390e5f2c4fdba.tar.bz2
opensim-SC_OLD-8a1d3b322fdd0361412246c55dc390e5f2c4fdba.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index af54c1a..b735c61 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -81,7 +81,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
81 } 81 }
82 82
83 if (groupsConfig.GetString("Module", "Default") != "Default") 83 if (groupsConfig.GetString("Module", "Default") != "Default")
84 {
85 m_Enabled = false;
84 return; 86 return;
87 }
85 } 88 }
86 89
87 } 90 }