diff options
author | Melanie | 2012-11-15 00:43:26 +0000 |
---|---|---|
committer | Melanie | 2012-11-15 00:43:26 +0000 |
commit | 06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e (patch) | |
tree | 845198db417e19540641316f7a8a09c8169e7086 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Added AssemblyInfos in the OpenSim.Server namespace dlls. (diff) | |
download | opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.zip opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.gz opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.bz2 opensim-SC_OLD-06fa1681ae5ae3743d9f9e9883500ee8c5ffe33e.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 1c28219..7bef1aa 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -208,19 +208,33 @@ namespace OpenSim | |||
208 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; | 208 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; |
209 | if (simDataConfig == null) | 209 | if (simDataConfig == null) |
210 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); | 210 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
211 | |||
211 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); | 212 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); |
212 | if (String.IsNullOrEmpty(module)) | 213 | if (String.IsNullOrEmpty(module)) |
213 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); | 214 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); |
215 | |||
214 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); | 216 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); |
217 | if (m_simulationDataService == null) | ||
218 | throw new Exception( | ||
219 | string.Format( | ||
220 | "Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.", | ||
221 | module)); | ||
215 | 222 | ||
216 | // Load the estate data service | 223 | // Load the estate data service |
217 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; | 224 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; |
218 | if (estateDataConfig == null) | 225 | if (estateDataConfig == null) |
219 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); | 226 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
227 | |||
220 | module = estateDataConfig.GetString("LocalServiceModule", String.Empty); | 228 | module = estateDataConfig.GetString("LocalServiceModule", String.Empty); |
221 | if (String.IsNullOrEmpty(module)) | 229 | if (String.IsNullOrEmpty(module)) |
222 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); | 230 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); |
231 | |||
223 | m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { m_config.Source }); | 232 | m_estateDataService = ServerUtils.LoadPlugin<IEstateDataService>(module, new object[] { m_config.Source }); |
233 | if (m_estateDataService == null) | ||
234 | throw new Exception( | ||
235 | string.Format( | ||
236 | "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", | ||
237 | module)); | ||
224 | 238 | ||
225 | base.StartupSpecific(); | 239 | base.StartupSpecific(); |
226 | 240 | ||