Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-10 04:05:04 +01:00
19 changed files with 78 additions and 40 deletions

View File

@@ -365,7 +365,7 @@ namespace OpenSim
// 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);
scene.CreateTerrainTexture();
// TODO : Try setting resource for region xstats here on scene
MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));