diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 9fdba92..df6a17b 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -211,16 +211,16 @@ namespace OpenSim | |||
211 | // Load the simulation data service | 211 | // Load the simulation data service |
212 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; | 212 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; |
213 | if (simDataConfig == null) | 213 | if (simDataConfig == null) |
214 | throw new Exception("Configuration file is missing the [SimulationDataStore] section"); | 214 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
215 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); | 215 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); |
216 | if (String.IsNullOrEmpty(module)) | 216 | if (String.IsNullOrEmpty(module)) |
217 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section"); | 217 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); |
218 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); | 218 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); |
219 | 219 | ||
220 | // Load the estate data service | 220 | // Load the estate data service |
221 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; | 221 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; |
222 | if (estateDataConfig == null) | 222 | if (estateDataConfig == null) |
223 | throw new Exception("Configuration file is missing the [EstateDataStore] section"); | 223 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
224 | module = estateDataConfig.GetString("LocalServiceModule", String.Empty); | 224 | module = estateDataConfig.GetString("LocalServiceModule", String.Empty); |
225 | if (String.IsNullOrEmpty(module)) | 225 | if (String.IsNullOrEmpty(module)) |
226 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); | 226 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); |