* Start loading prims after region module configuration rather than before

* In some circumstances, loading prims can invoke region modules
0.6.0-stable
Justin Clarke Casey 2008-09-11 13:56:25 +00:00
parent e04ce96cee
commit f3497d9f57
2 changed files with 6 additions and 4 deletions

View File

@ -542,6 +542,11 @@ namespace OpenSim
}
scene.SetModuleInterfaces();
// Prims have to be loaded after module configuration since some modules may be invoked during the load
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
scene.StartTimer();
//moved these here as the terrain texture has to be created after the modules are initialized
// and has to happen before the region is registered with the grid.

View File

@ -163,10 +163,7 @@ namespace OpenSim.Region.ClientStack
scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
}
scene.LoadPrimsFromStorage(regionInfo.originRegionID);
scene.StartTimer();
return scene;
}