Merge branch 'master' into bigmerge
commit
d2dc2316c2
|
@ -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;
|
||||
|
|
|
@ -1377,7 +1377,7 @@
|
|||
GroupsCacheTimeout = 30
|
||||
|
||||
; Specify which messaging module to use for groups messaging and if it's enabled
|
||||
;MessagingModule = GroupsMessagingModule
|
||||
MessagingModule = GroupsMessagingModule
|
||||
;MessagingEnabled = true
|
||||
|
||||
; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
|
||||
|
|
Loading…
Reference in New Issue