aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/MapImageService/MapImageService.cs
diff options
context:
space:
mode:
authorMelanie2011-11-19 22:26:41 +0100
committerMelanie2011-11-19 22:26:41 +0100
commitdec8b9c98dae977d6d9a94cc21d296f10957cf44 (patch)
tree27c5a94ae30b1acb7d0f0cd120f6060fb1ef5be2 /OpenSim/Services/MapImageService/MapImageService.cs
parentMerge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff)
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC_OLD-dec8b9c98dae977d6d9a94cc21d296f10957cf44.zip
opensim-SC_OLD-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.gz
opensim-SC_OLD-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.bz2
opensim-SC_OLD-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Services/MapImageService/MapImageService.cs')
-rw-r--r--OpenSim/Services/MapImageService/MapImageService.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 7e7391c..a85ee70 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -138,6 +138,8 @@ namespace OpenSim.Services.MapImageService
138 138
139 public byte[] GetMapTile(string fileName, out string format) 139 public byte[] GetMapTile(string fileName, out string format)
140 { 140 {
141// m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
142
141 format = ".jpg"; 143 format = ".jpg";
142 string fullName = Path.Combine(m_TilesStoragePath, fileName); 144 string fullName = Path.Combine(m_TilesStoragePath, fileName);
143 if (File.Exists(fullName)) 145 if (File.Exists(fullName))
@@ -206,7 +208,7 @@ namespace OpenSim.Services.MapImageService
206 208
207 private bool CreateTile(uint zoomLevel, int x, int y) 209 private bool CreateTile(uint zoomLevel, int x, int y)
208 { 210 {
209 m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel); 211// m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel);
210 int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2); 212 int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2);
211 int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1); 213 int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1);
212 214