suspend httpdos on mapimge, fix image not been updated after first Get till restart

This commit is contained in:
UbitUmarov
2016-09-05 12:30:25 +01:00
parent 0e68742afc
commit 49c579ec71
2 changed files with 24 additions and 12 deletions

View File

@@ -210,7 +210,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
return;
}
m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name);
// mapTile.Save( // DEBUG DEBUG
// String.Format("maptiles/raw-{0}-{1}-{2}.jpg", regionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY),
@@ -218,12 +217,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
// If the region/maptile is legacy sized, just upload the one tile like it has always been done
if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize)
{
m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name);
ConvertAndUploadMaptile(scene, mapTile,
scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY,
scene.RegionInfo.RegionName);
}
else
{
m_log.DebugFormat("{0} Upload {1} maptiles for {2}", LogHeader,
(mapTile.Width * mapTile.Height) / (Constants.RegionSize * Constants.RegionSize),
scene.Name);
// For larger regions (varregion) we must cut the region image into legacy sized
// pieces since that is how the maptile system works.
// Note the assumption that varregions are always a multiple of legacy size.