Changed the order of things in Scene creation. This piece of code is very jibbery, widely different results with slightly different orders. This particular order produces the best results in the UC Irvine sim in osgrid. But clearly there's something messed up here.
Addresses mantis #3707, mantis #3713, mantis #3686.0.6.6-post-fixes
parent
b773a3a02f
commit
c061b4cb49
|
@ -384,18 +384,16 @@ 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();
|
||||
|
||||
// TODO : Try setting resource for region xstats here on scene
|
||||
scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
|
||||
|
||||
// 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.
|
||||
scene.CreateTerrainTexture(false);
|
||||
|
||||
// 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
|
||||
scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
|
||||
|
||||
try
|
||||
{
|
||||
scene.RegisterRegionWithGrid();
|
||||
|
@ -434,6 +432,9 @@ namespace OpenSim
|
|||
scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
|
||||
|
||||
mscene = scene;
|
||||
|
||||
scene.StartTimer();
|
||||
|
||||
return clientServer;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue