OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into bigmerge

avinationmerge
Melanie 2011-10-12 09:26:35 +01:00
parent 1d379a9c7b 0faa8db0ef
commit d2dc2316c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

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

2
bin/OpenSimDefaults.ini
View File

@ -1377,7 +1377,7 @@
GroupsCacheTimeout = 30 GroupsCacheTimeout = 30
; Specify which messaging module to use for groups messaging and if it's enabled ; Specify which messaging module to use for groups messaging and if it's enabled
;MessagingModule = GroupsMessagingModule MessagingModule = GroupsMessagingModule
;MessagingEnabled = true ;MessagingEnabled = true
; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend