diff options
author | UbitUmarov | 2016-09-05 12:30:25 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-05 12:30:25 +0100 |
commit | 49c579ec71cf785f1f6f5117446bbca48ccc3911 (patch) | |
tree | ce9a8d59d9afb083e6acf4ffc90c7fe8ee526c44 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Fix some wrong handling of booleans for SeeAVs, AnyAVSounds and GroupAVSounds... (diff) | |
download | opensim-SC_OLD-49c579ec71cf785f1f6f5117446bbca48ccc3911.zip opensim-SC_OLD-49c579ec71cf785f1f6f5117446bbca48ccc3911.tar.gz opensim-SC_OLD-49c579ec71cf785f1f6f5117446bbca48ccc3911.tar.bz2 opensim-SC_OLD-49c579ec71cf785f1f6f5117446bbca48ccc3911.tar.xz |
suspend httpdos on mapimge, fix image not been updated after first Get till restart
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index f40541e..1357825 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | |||
@@ -210,7 +210,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
210 | return; | 210 | return; |
211 | } | 211 | } |
212 | 212 | ||
213 | m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name); | ||
214 | 213 | ||
215 | // mapTile.Save( // DEBUG DEBUG | 214 | // mapTile.Save( // DEBUG DEBUG |
216 | // String.Format("maptiles/raw-{0}-{1}-{2}.jpg", regionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY), | 215 | // 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 | |||
218 | // If the region/maptile is legacy sized, just upload the one tile like it has always been done | 217 | // If the region/maptile is legacy sized, just upload the one tile like it has always been done |
219 | if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize) | 218 | if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize) |
220 | { | 219 | { |
220 | m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name); | ||
221 | ConvertAndUploadMaptile(scene, mapTile, | 221 | ConvertAndUploadMaptile(scene, mapTile, |
222 | scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, | 222 | scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, |
223 | scene.RegionInfo.RegionName); | 223 | scene.RegionInfo.RegionName); |
224 | } | 224 | } |
225 | else | 225 | else |
226 | { | 226 | { |
227 | m_log.DebugFormat("{0} Upload {1} maptiles for {2}", LogHeader, | ||
228 | (mapTile.Width * mapTile.Height) / (Constants.RegionSize * Constants.RegionSize), | ||
229 | scene.Name); | ||
230 | |||
227 | // For larger regions (varregion) we must cut the region image into legacy sized | 231 | // For larger regions (varregion) we must cut the region image into legacy sized |
228 | // pieces since that is how the maptile system works. | 232 | // pieces since that is how the maptile system works. |
229 | // Note the assumption that varregions are always a multiple of legacy size. | 233 | // Note the assumption that varregions are always a multiple of legacy size. |