From f76ea3bb767e2af69d6764adb8223c62582cad12 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 27 Jan 2017 20:07:02 +0000 Subject: [PATCH] parcels must be loaded before objects, so they can be added to them --- OpenSim/Region/Application/OpenSimBase.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b33e2c2784..8a0536a9ce 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -459,15 +459,14 @@ namespace OpenSim while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) SetUpEstateOwner(scene); + scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); + // Prims have to be loaded after module configuration since some modules may be invoked during the load scene.LoadPrimsFromStorage(regionInfo.originRegionID); // TODO : Try setting resource for region xstats here on scene MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); - scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); - scene.EventManager.TriggerParcelPrimCountUpdate(); - if (scene.SnmpService != null) { scene.SnmpService.BootInfo("Grid Registration in progress", scene);