From ca74088d942393fedc143dfa547f3c7951a077bd Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 12 Oct 2011 09:21:46 +0100 Subject: [PATCH 1/3] 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/3] 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 From 4b7b9e81f7b33c86f691e2bca756a3639fe9ee04 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 12 Oct 2011 15:41:59 +0100 Subject: [PATCH 3/3] Make it possible to disable the HG linker. On non-HG systems it spits yellow spam, so it should not load unless HG is desired. --- OpenSim/Services/GridService/HypergridLinker.cs | 7 +++++++ bin/config-include/GridHypergrid.ini | 1 + bin/config-include/HyperSimianGrid.ini | 1 + bin/config-include/StandaloneHypergrid.ini | 1 + 4 files changed, 10 insertions(+) diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 83ec1229ac..90c022f743 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -102,6 +102,13 @@ namespace OpenSim.Services.GridService public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db) { + IConfig modulesConfig = config.Configs["Modules"]; + if (modulesConfig == null) + return; + + if (modulesConfig.GetString("HypergridLinker", "") != "HypergridLinker") + return; + m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType()); m_Database = db; diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 60a3c625f2..4c3249816c 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -26,6 +26,7 @@ LandServices = "RemoteLandServicesConnector" FriendsModule = "HGFriendsModule" MapImageService = "MapImageServiceModule" + HypergridLinker = "HypergridLinker" LandServiceInConnector = true NeighbourServiceInConnector = true diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 89d6be79e3..ec4efc0274 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini @@ -40,6 +40,7 @@ LibraryModule = false AssetCaching = "FlotsamAssetCache" + HypergridLinker = "HypergridLinker" [SimulationDataStore] LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 719df5c5c3..f8c258a8a3 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -22,6 +22,7 @@ EntityTransferModule = "HGEntityTransferModule" InventoryAccessModule = "HGInventoryAccessModule" FriendsModule = "HGFriendsModule" + HypergridLinker = "HypergridLinker" InventoryServiceInConnector = true AssetServiceInConnector = true