Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

6 files changed, 12 insertions, 2 deletions

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;
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;
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9cedd98..9685467 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
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 60a3c62..4c32498 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 89d6be7..ec4efc0 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 719df5c..f8c258a 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