From ca74088d942393fedc143dfa547f3c7951a077bd Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 12 Oct 2011 09:21:46 +0100 Subject: [PATCH 1/2] Change default groups messaging module in hardcode to the empty string. Modules should not assume thet they are the one and only, but only be enabled when explicitly configured. --- .../Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 0800e98f0b..a12e6ea1ac 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs @@ -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; From 0faa8db0ef47787ccfa2de37645b54135e91411e Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 12 Oct 2011 09:23:57 +0100 Subject: [PATCH 2/2] Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled by default) the config default. This way it will work for current cases while allowing the use of other groups modules without config bloat. --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9cedd980ec..96854675fe 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -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