diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 90c022f..78eab3d 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -102,50 +102,45 @@ 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"]; | 105 | IConfig gridConfig = config.Configs["GridService"]; |
106 | if (modulesConfig == null) | 106 | if (gridConfig == null) |
107 | return; | 107 | return; |
108 | |||
109 | if (modulesConfig.GetString("HypergridLinker", "") != "HypergridLinker") | ||
110 | return; | ||
111 | 108 | ||
112 | m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType()); | 109 | if (!gridConfig.GetBoolean("HypergridLinker", false)) |
110 | return; | ||
113 | 111 | ||
114 | m_Database = db; | 112 | m_Database = db; |
115 | m_GridService = gridService; | 113 | m_GridService = gridService; |
114 | m_log.DebugFormat("[HYPERGRID LINKER]: Starting with db {0}", db.GetType()); | ||
116 | 115 | ||
117 | IConfig gridConfig = config.Configs["GridService"]; | 116 | string assetService = gridConfig.GetString("AssetService", string.Empty); |
118 | if (gridConfig != null) | ||
119 | { | ||
120 | string assetService = gridConfig.GetString("AssetService", string.Empty); | ||
121 | 117 | ||
122 | Object[] args = new Object[] { config }; | 118 | Object[] args = new Object[] { config }; |
123 | 119 | ||
124 | if (assetService != string.Empty) | 120 | if (assetService != string.Empty) |
125 | m_AssetService = ServerUtils.LoadPlugin<IAssetService>(assetService, args); | 121 | m_AssetService = ServerUtils.LoadPlugin<IAssetService>(assetService, args); |
126 | 122 | ||
127 | string scope = gridConfig.GetString("ScopeID", string.Empty); | 123 | string scope = gridConfig.GetString("ScopeID", string.Empty); |
128 | if (scope != string.Empty) | 124 | if (scope != string.Empty) |
129 | UUID.TryParse(scope, out m_ScopeID); | 125 | UUID.TryParse(scope, out m_ScopeID); |
130 | 126 | ||
131 | // m_Check4096 = gridConfig.GetBoolean("Check4096", true); | 127 | // m_Check4096 = gridConfig.GetBoolean("Check4096", true); |
132 | 128 | ||
133 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | 129 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); |
134 | 130 | ||
135 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); | 131 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", string.Empty); |
136 | try | 132 | try |
137 | { | 133 | { |
138 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); | 134 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); |
139 | } | 135 | } |
140 | catch | 136 | catch |
141 | { | 137 | { |
142 | m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper); | 138 | m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper); |
143 | } | 139 | } |
144 | 140 | ||
145 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); | 141 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); |
146 | 142 | ||
147 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); | 143 | m_log.Debug("[HYPERGRID LINKER]: Loaded all services..."); |
148 | } | ||
149 | 144 | ||
150 | if (!string.IsNullOrEmpty(m_MapTileDirectory)) | 145 | if (!string.IsNullOrEmpty(m_MapTileDirectory)) |
151 | { | 146 | { |