4 files changed, 10 insertions, 0 deletions

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/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