diff options
| author | Melanie | 2011-10-12 16:45:48 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 16:45:48 +0100 |
| commit | 35def547f7b53312a280d3786b9196688d335382 (patch) | |
| tree | 81a301bbb251e8a5e4b06e37eead59f0f30cb04f /OpenSim | |
| parent | Disable Flotsam groups messaging module in our config base (diff) | |
| parent | Make it possible to disable the HG linker. On non-HG systems it spits yellow (diff) | |
| download | opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.zip opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.gz opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.bz2 opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 186ca71..b70b425 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; |