Merge branch 'master' into presence-refactor

This commit is contained in:
Melanie
2010-03-01 01:01:32 +00:00
8 changed files with 951 additions and 804 deletions

View File

@@ -432,6 +432,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;
currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
currentRegionSettings.Save();
IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();