diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
3 files changed, 11 insertions, 4 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)); |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 3f6f359..fc240d3 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -209,16 +209,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
209 | // path, param, agentID.ToString()); | 209 | // path, param, agentID.ToString()); |
210 | 210 | ||
211 | // There is a major hack going on in this method. The viewer doesn't request | 211 | // There is a major hack going on in this method. The viewer doesn't request |
212 | // map blocks (RequestMapBlocks) above 4096. That means that if we don't hack, | 212 | // map blocks (RequestMapBlocks) above 2048. That means that if we don't hack, |
213 | // grids above that cell don't have a map at all. So, here's the hack: we wait | 213 | // grids above that cell don't have a map at all. So, here's the hack: we wait |
214 | // for this CAP request to come, and we inject the map blocks at this point. | 214 | // for this CAP request to come, and we inject the map blocks at this point. |
215 | // In a normal scenario, this request simply sends back the MapLayer (the blue color). | 215 | // In a normal scenario, this request simply sends back the MapLayer (the blue color). |
216 | // In the hacked scenario, it also sends the map blocks via UDP. | 216 | // In the hacked scenario, it also sends the map blocks via UDP. |
217 | // | 217 | // |
218 | // 6/8/2011 -- I'm adding an explicit 4096 check, so that we never forget that there is | 218 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is |
219 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. | 219 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. |
220 | 220 | ||
221 | if (m_scene.RegionInfo.RegionLocX >= 4096 || m_scene.RegionInfo.RegionLocY >= 4096) | 221 | if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048) |
222 | { | 222 | { |
223 | ScenePresence avatarPresence = null; | 223 | ScenePresence avatarPresence = null; |
224 | 224 | ||
@@ -845,7 +845,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
845 | } | 845 | } |
846 | } | 846 | } |
847 | 847 | ||
848 | protected virtual void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) | 848 | protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) |
849 | { | 849 | { |
850 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 850 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
851 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 851 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
@@ -860,6 +860,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
860 | mapBlocks.Add(block); | 860 | mapBlocks.Add(block); |
861 | } | 861 | } |
862 | remoteClient.SendMapBlock(mapBlocks, 0); | 862 | remoteClient.SendMapBlock(mapBlocks, 0); |
863 | |||
864 | return mapBlocks; | ||
863 | } | 865 | } |
864 | 866 | ||
865 | protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) | 867 | protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) |