Merge branch 'master' into presence-refactor

author: Melanie 2010-03-01 01:01:32 +0000
committer: Melanie 2010-03-01 01:01:32 +0000
commit: 38ea1dd5c82df6e037f7e634df572df5a38b2bd0 (patch)
tree: 5d94d42e833985ff13a1522085b28f9889d70595 /OpenSim/Region/CoreModules/World
parent: Should have things the right way around, better that way (diff)
parent: fix bug where region settings loaded via an oar (water height, terrain textur... (diff)
download: opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.zip
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.gz
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.bz2
opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.xz
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 40d6b23..b1b2336f8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -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>();
author	Melanie	2010-03-01 01:01:32 +0000
committer	Melanie	2010-03-01 01:01:32 +0000
commit	38ea1dd5c82df6e037f7e634df572df5a38b2bd0 (patch)
tree	5d94d42e833985ff13a1522085b28f9889d70595 /OpenSim/Region/CoreModules/World
parent	Should have things the right way around, better that way (diff)
parent	fix bug where region settings loaded via an oar (water height, terrain textur... (diff)
download	opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.zip opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.gz opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.bz2 opensim-SC_OLD-38ea1dd5c82df6e037f7e634df572df5a38b2bd0.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 40d6b23..b1b2336f8 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -432,6 +432,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
432	currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;	432	currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;
433	currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;	433	currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
434	currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;	434	currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
		435
		436	currentRegionSettings.Save();
435		437
436	IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();	438	IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
437		439