From c061b4cb49ae5b2b1d51fffbf17402341e191a8b Mon Sep 17 00:00:00 2001 From: diva Date: Tue, 26 May 2009 16:45:30 +0000 Subject: [PATCH] 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. --- OpenSim/Region/Application/OpenSimBase.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3ea636abda..8fef46155c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -384,18 +384,16 @@ namespace OpenSim scene.SetModuleInterfaces(); + // 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); - - 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); - try { scene.RegisterRegionWithGrid(); @@ -434,6 +432,9 @@ namespace OpenSim scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); }; mscene = scene; + + scene.StartTimer(); + return clientServer; }