From ca74088d942393fedc143dfa547f3c7951a077bd Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 12 Oct 2011 09:21:46 +0100
Subject: 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.

---
 .../Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 0800e98..a12e6ea 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;
-- 
cgit v1.1


From 4b7b9e81f7b33c86f691e2bca756a3639fe9ee04 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 12 Oct 2011 15:41:59 +0100
Subject: 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 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 83ec122..90c022f 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;
-- 
cgit v1.1