aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-01-27 20:07:02 +0000
committerUbitUmarov2017-01-27 20:07:02 +0000
commitf76ea3bb767e2af69d6764adb8223c62582cad12 (patch)
tree5bbb629c6052407fd50f3984d9dfb4a01347cb1f
parentbug fix: wrong enabled check (diff)
downloadopensim-SC_OLD-f76ea3bb767e2af69d6764adb8223c62582cad12.zip
opensim-SC_OLD-f76ea3bb767e2af69d6764adb8223c62582cad12.tar.gz
opensim-SC_OLD-f76ea3bb767e2af69d6764adb8223c62582cad12.tar.bz2
opensim-SC_OLD-f76ea3bb767e2af69d6764adb8223c62582cad12.tar.xz
parcels must be loaded before objects, so they can be added to them
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b33e2c2..8a0536a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -459,15 +459,14 @@ namespace OpenSim
459 while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) 459 while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
460 SetUpEstateOwner(scene); 460 SetUpEstateOwner(scene);
461 461
462 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
463
462 // Prims have to be loaded after module configuration since some modules may be invoked during the load 464 // Prims have to be loaded after module configuration since some modules may be invoked during the load
463 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 465 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
464 466
465 // TODO : Try setting resource for region xstats here on scene 467 // TODO : Try setting resource for region xstats here on scene
466 MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo)); 468 MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
467 469
468 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
469 scene.EventManager.TriggerParcelPrimCountUpdate();
470
471 if (scene.SnmpService != null) 470 if (scene.SnmpService != null)
472 { 471 {
473 scene.SnmpService.BootInfo("Grid Registration in progress", scene); 472 scene.SnmpService.BootInfo("Grid Registration in progress", scene);