diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 75dc741..079d733 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -88,6 +88,7 @@ namespace OpenSim | |||
88 | 88 | ||
89 | public string userStatsURI = String.Empty; | 89 | public string userStatsURI = String.Empty; |
90 | public string managedStatsURI = String.Empty; | 90 | public string managedStatsURI = String.Empty; |
91 | public string managedStatsPassword = String.Empty; | ||
91 | 92 | ||
92 | protected bool m_autoCreateClientStack = true; | 93 | protected bool m_autoCreateClientStack = true; |
93 | 94 | ||
@@ -239,6 +240,7 @@ namespace OpenSim | |||
239 | m_permsModules = new List<string>(permissionModules.Split(',')); | 240 | m_permsModules = new List<string>(permissionModules.Split(',')); |
240 | 241 | ||
241 | managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty); | 242 | managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty); |
243 | managedStatsPassword = startupConfig.GetString("ManagedStatsRemoteFetchPassword", String.Empty); | ||
242 | } | 244 | } |
243 | 245 | ||
244 | // Load the simulation data service | 246 | // Load the simulation data service |
@@ -481,15 +483,14 @@ namespace OpenSim | |||
481 | while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) | 483 | while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) |
482 | SetUpEstateOwner(scene); | 484 | SetUpEstateOwner(scene); |
483 | 485 | ||
486 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | ||
487 | |||
484 | // Prims have to be loaded after module configuration since some modules may be invoked during the load | 488 | // Prims have to be loaded after module configuration since some modules may be invoked during the load |
485 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 489 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
486 | 490 | ||
487 | // TODO : Try setting resource for region xstats here on scene | 491 | // TODO : Try setting resource for region xstats here on scene |
488 | MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); | 492 | MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); |
489 | 493 | ||
490 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | ||
491 | scene.EventManager.TriggerParcelPrimCountUpdate(); | ||
492 | |||
493 | if (scene.SnmpService != null) | 494 | if (scene.SnmpService != null) |
494 | { | 495 | { |
495 | scene.SnmpService.BootInfo("Grid Registration in progress", scene); | 496 | scene.SnmpService.BootInfo("Grid Registration in progress", scene); |