diff options
author | Diva Canto | 2011-06-12 21:51:26 -0700 |
---|---|---|
committer | Diva Canto | 2011-06-12 21:51:26 -0700 |
commit | 2e77518c6dd5f06c965df758ebd0a20a39c96dc8 (patch) | |
tree | a84f55ff8a0c8708f3b72fcc103a5e86f59adb48 | |
parent | Trailing / in MapTileURL must be there! (diff) | |
download | opensim-SC_OLD-2e77518c6dd5f06c965df758ebd0a20a39c96dc8.zip opensim-SC_OLD-2e77518c6dd5f06c965df758ebd0a20a39c96dc8.tar.gz opensim-SC_OLD-2e77518c6dd5f06c965df758ebd0a20a39c96dc8.tar.bz2 opensim-SC_OLD-2e77518c6dd5f06c965df758ebd0a20a39c96dc8.tar.xz |
bit depth: 24!!! begeez! -- zoom levels work now.
-rw-r--r-- | OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/MapImageService/MapImageService.cs | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs index 76dd695..53d08fa 100644 --- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | |||
@@ -42,11 +42,13 @@ namespace OpenSim.Server.Handlers.MapImage | |||
42 | { | 42 | { |
43 | public class MapGetServiceConnector : ServiceConnector | 43 | public class MapGetServiceConnector : ServiceConnector |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | private IMapImageService m_MapService; | 46 | private IMapImageService m_MapService; |
47 | |||
46 | private string m_ConfigName = "MapImageService"; | 48 | private string m_ConfigName = "MapImageService"; |
47 | 49 | ||
48 | public MapGetServiceConnector(IConfigSource config, IHttpServer server, string configName) : | 50 | public MapGetServiceConnector(IConfigSource config, IHttpServer server, string configName) : |
49 | base(config, server, configName) | 51 | base(config, server, configName) |
50 | { | 52 | { |
51 | IConfig serverConfig = config.Configs[m_ConfigName]; | 53 | IConfig serverConfig = config.Configs[m_ConfigName]; |
52 | if (serverConfig == null) | 54 | if (serverConfig == null) |
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index ee424e1..736fa2e 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
@@ -144,7 +144,6 @@ namespace OpenSim.Services.MapImageService | |||
144 | } | 144 | } |
145 | else if (File.Exists(m_WaterTileFile)) | 145 | else if (File.Exists(m_WaterTileFile)) |
146 | { | 146 | { |
147 | m_log.DebugFormat("[MAP IMAGE SERVICE]: File not found {0}, sending water", fileName); | ||
148 | return File.ReadAllBytes(m_WaterTileFile); | 147 | return File.ReadAllBytes(m_WaterTileFile); |
149 | } | 148 | } |
150 | else | 149 | else |
@@ -188,7 +187,7 @@ namespace OpenSim.Services.MapImageService | |||
188 | else | 187 | else |
189 | { | 188 | { |
190 | // Create a new output tile with a transparent background | 189 | // Create a new output tile with a transparent background |
191 | Bitmap bm = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); | 190 | Bitmap bm = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH, PixelFormat.Format24bppRgb); |
192 | bm.MakeTransparent(); | 191 | bm.MakeTransparent(); |
193 | return bm; | 192 | return bm; |
194 | } | 193 | } |
@@ -255,7 +254,7 @@ namespace OpenSim.Services.MapImageService | |||
255 | using (Bitmap final = new Bitmap(output)) | 254 | using (Bitmap final = new Bitmap(output)) |
256 | { | 255 | { |
257 | output.Dispose(); | 256 | output.Dispose(); |
258 | final.Save(outputFile); | 257 | final.Save(outputFile, ImageFormat.Jpeg); |
259 | } | 258 | } |
260 | } | 259 | } |
261 | catch (Exception e) | 260 | catch (Exception e) |