diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 9f9b4f0..f482d8f 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -202,16 +202,16 @@ namespace OpenSim | |||
202 | // Load the simulation data service | 202 | // Load the simulation data service |
203 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; | 203 | IConfig simDataConfig = m_config.Source.Configs["SimulationDataStore"]; |
204 | if (simDataConfig == null) | 204 | if (simDataConfig == null) |
205 | throw new Exception("Configuration file is missing the [SimulationDataStore] section"); | 205 | throw new Exception("Configuration file is missing the [SimulationDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
206 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); | 206 | string module = simDataConfig.GetString("LocalServiceModule", String.Empty); |
207 | if (String.IsNullOrEmpty(module)) | 207 | if (String.IsNullOrEmpty(module)) |
208 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section"); | 208 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [SimulationDataStore] section."); |
209 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); | 209 | m_simulationDataService = ServerUtils.LoadPlugin<ISimulationDataService>(module, new object[] { m_config.Source }); |
210 | 210 | ||
211 | // Load the estate data service | 211 | // Load the estate data service |
212 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; | 212 | IConfig estateDataConfig = m_config.Source.Configs["EstateDataStore"]; |
213 | if (estateDataConfig == null) | 213 | if (estateDataConfig == null) |
214 | throw new Exception("Configuration file is missing the [EstateDataStore] section"); | 214 | throw new Exception("Configuration file is missing the [EstateDataStore] section. Have you copied OpenSim.ini.example to OpenSim.ini to reference config-include/ files?"); |
215 | module = estateDataConfig.GetString("LocalServiceModule", String.Empty); | 215 | module = estateDataConfig.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 [EstateDataStore] section"); | 217 | throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] section"); |
@@ -383,6 +383,9 @@ namespace OpenSim | |||
383 | // TODO : Try setting resource for region xstats here on scene | 383 | // TODO : Try setting resource for region xstats here on scene |
384 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 384 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |
385 | 385 | ||
386 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | ||
387 | scene.EventManager.TriggerParcelPrimCountUpdate(); | ||
388 | |||
386 | try | 389 | try |
387 | { | 390 | { |
388 | scene.RegisterRegionWithGrid(); | 391 | scene.RegisterRegionWithGrid(); |
@@ -398,9 +401,6 @@ namespace OpenSim | |||
398 | Environment.Exit(1); | 401 | Environment.Exit(1); |
399 | } | 402 | } |
400 | 403 | ||
401 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | ||
402 | scene.EventManager.TriggerParcelPrimCountUpdate(); | ||
403 | |||
404 | // We need to do this after we've initialized the | 404 | // We need to do this after we've initialized the |
405 | // scripting engines. | 405 | // scripting engines. |
406 | scene.CreateScriptInstances(); | 406 | scene.CreateScriptInstances(); |