diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 3ea636a..8fef461 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -384,18 +384,16 @@ namespace OpenSim | |||
384 | 384 | ||
385 | scene.SetModuleInterfaces(); | 385 | scene.SetModuleInterfaces(); |
386 | 386 | ||
387 | // moved these here as the terrain texture has to be created after the modules are initialized | ||
388 | // and has to happen before the region is registered with the grid. | ||
389 | scene.CreateTerrainTexture(false); | ||
390 | |||
387 | // Prims have to be loaded after module configuration since some modules may be invoked during the load | 391 | // Prims have to be loaded after module configuration since some modules may be invoked during the load |
388 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 392 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
389 | |||
390 | scene.StartTimer(); | ||
391 | 393 | ||
392 | // TODO : Try setting resource for region xstats here on scene | 394 | // TODO : Try setting resource for region xstats here on scene |
393 | scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 395 | scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |
394 | 396 | ||
395 | // moved these here as the terrain texture has to be created after the modules are initialized | ||
396 | // and has to happen before the region is registered with the grid. | ||
397 | scene.CreateTerrainTexture(false); | ||
398 | |||
399 | try | 397 | try |
400 | { | 398 | { |
401 | scene.RegisterRegionWithGrid(); | 399 | scene.RegisterRegionWithGrid(); |
@@ -434,6 +432,9 @@ namespace OpenSim | |||
434 | scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); }; | 432 | scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); }; |
435 | 433 | ||
436 | mscene = scene; | 434 | mscene = scene; |
435 | |||
436 | scene.StartTimer(); | ||
437 | |||
437 | return clientServer; | 438 | return clientServer; |
438 | } | 439 | } |
439 | 440 | ||