aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-12 15:41:59 +0100
committerMelanie2011-10-12 15:41:59 +0100
commit4b7b9e81f7b33c86f691e2bca756a3639fe9ee04 (patch)
treedbf3b2489e50cdabeba0ef1545a29f898427d40b
parentUpdate OpenSimDefaults.ini to make the prior state (Groups messaging enabled (diff)
downloadopensim-SC_OLD-4b7b9e81f7b33c86f691e2bca756a3639fe9ee04.zip
opensim-SC_OLD-4b7b9e81f7b33c86f691e2bca756a3639fe9ee04.tar.gz
opensim-SC_OLD-4b7b9e81f7b33c86f691e2bca756a3639fe9ee04.tar.bz2
opensim-SC_OLD-4b7b9e81f7b33c86f691e2bca756a3639fe9ee04.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs7
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/HyperSimianGrid.ini1
-rw-r--r--bin/config-include/StandaloneHypergrid.ini1
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
102 102
103 public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db) 103 public HypergridLinker(IConfigSource config, GridService gridService, IRegionData db)
104 { 104 {
105 IConfig modulesConfig = config.Configs["Modules"];
106 if (modulesConfig == null)
107 return;
108
109 if (modulesConfig.GetString("HypergridLinker", "") != "HypergridLinker")
110 return;
111
105 m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType()); 112 m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType());
106 113
107 m_Database = db; 114 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 @@
26 LandServices = "RemoteLandServicesConnector" 26 LandServices = "RemoteLandServicesConnector"
27 FriendsModule = "HGFriendsModule" 27 FriendsModule = "HGFriendsModule"
28 MapImageService = "MapImageServiceModule" 28 MapImageService = "MapImageServiceModule"
29 HypergridLinker = "HypergridLinker"
29 30
30 LandServiceInConnector = true 31 LandServiceInConnector = true
31 NeighbourServiceInConnector = true 32 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 @@
40 LibraryModule = false 40 LibraryModule = false
41 41
42 AssetCaching = "FlotsamAssetCache" 42 AssetCaching = "FlotsamAssetCache"
43 HypergridLinker = "HypergridLinker"
43 44
44[SimulationDataStore] 45[SimulationDataStore]
45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 46 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 @@
22 EntityTransferModule = "HGEntityTransferModule" 22 EntityTransferModule = "HGEntityTransferModule"
23 InventoryAccessModule = "HGInventoryAccessModule" 23 InventoryAccessModule = "HGInventoryAccessModule"
24 FriendsModule = "HGFriendsModule" 24 FriendsModule = "HGFriendsModule"
25 HypergridLinker = "HypergridLinker"
25 26
26 InventoryServiceInConnector = true 27 InventoryServiceInConnector = true
27 AssetServiceInConnector = true 28 AssetServiceInConnector = true