Merge branch 'master' into bigmerge

This commit is contained in:
Melanie
2011-10-12 09:26:35 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// if groups aren't enabled, we're not needed.
// if we're not specified as the connector to use, then we're not wanted
if ((groupsConfig.GetBoolean("Enabled", false) == false)
|| (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name))
|| (groupsConfig.GetString("MessagingModule", "") != Name))
{
m_groupMessagingEnabled = false;
return;