diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index d11d677..f85a917 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -506,6 +506,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
506 | currentRegionSettings.Elevation2SE = loadedRegionSettings.Elevation2SE; | 506 | currentRegionSettings.Elevation2SE = loadedRegionSettings.Elevation2SE; |
507 | currentRegionSettings.Elevation2SW = loadedRegionSettings.Elevation2SW; | 507 | currentRegionSettings.Elevation2SW = loadedRegionSettings.Elevation2SW; |
508 | currentRegionSettings.FixedSun = loadedRegionSettings.FixedSun; | 508 | currentRegionSettings.FixedSun = loadedRegionSettings.FixedSun; |
509 | currentRegionSettings.SunPosition = loadedRegionSettings.SunPosition; | ||
509 | currentRegionSettings.ObjectBonus = loadedRegionSettings.ObjectBonus; | 510 | currentRegionSettings.ObjectBonus = loadedRegionSettings.ObjectBonus; |
510 | currentRegionSettings.RestrictPushing = loadedRegionSettings.RestrictPushing; | 511 | currentRegionSettings.RestrictPushing = loadedRegionSettings.RestrictPushing; |
511 | currentRegionSettings.TerrainLowerLimit = loadedRegionSettings.TerrainLowerLimit; | 512 | currentRegionSettings.TerrainLowerLimit = loadedRegionSettings.TerrainLowerLimit; |
@@ -518,6 +519,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
518 | currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight; | 519 | currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight; |
519 | 520 | ||
520 | currentRegionSettings.Save(); | 521 | currentRegionSettings.Save(); |
522 | |||
523 | m_scene.TriggerEstateSunUpdate(); | ||
521 | 524 | ||
522 | IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); | 525 | IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>(); |
523 | 526 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 34e2e23..6ba3459 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -440,6 +440,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
440 | rs.Elevation2SE = 9.2; | 440 | rs.Elevation2SE = 9.2; |
441 | rs.Elevation2SW = 2.1; | 441 | rs.Elevation2SW = 2.1; |
442 | rs.FixedSun = true; | 442 | rs.FixedSun = true; |
443 | rs.SunPosition = 12.0; | ||
443 | rs.ObjectBonus = 1.4; | 444 | rs.ObjectBonus = 1.4; |
444 | rs.RestrictPushing = true; | 445 | rs.RestrictPushing = true; |
445 | rs.TerrainLowerLimit = 0.4; | 446 | rs.TerrainLowerLimit = 0.4; |
@@ -485,6 +486,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
485 | Assert.That(loadedRs.Elevation2SE, Is.EqualTo(9.2)); | 486 | Assert.That(loadedRs.Elevation2SE, Is.EqualTo(9.2)); |
486 | Assert.That(loadedRs.Elevation2SW, Is.EqualTo(2.1)); | 487 | Assert.That(loadedRs.Elevation2SW, Is.EqualTo(2.1)); |
487 | Assert.That(loadedRs.FixedSun, Is.True); | 488 | Assert.That(loadedRs.FixedSun, Is.True); |
489 | Assert.AreEqual(12.0, loadedRs.SunPosition); | ||
488 | Assert.That(loadedRs.ObjectBonus, Is.EqualTo(1.4)); | 490 | Assert.That(loadedRs.ObjectBonus, Is.EqualTo(1.4)); |
489 | Assert.That(loadedRs.RestrictPushing, Is.True); | 491 | Assert.That(loadedRs.RestrictPushing, Is.True); |
490 | Assert.That(loadedRs.TerrainLowerLimit, Is.EqualTo(0.4)); | 492 | Assert.That(loadedRs.TerrainLowerLimit, Is.EqualTo(0.4)); |