Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2013-07-26 19:23:12 +01:00 · 2013-07-26 19:23:12 +01:00 · c245365484
parent 056a6ee765 9038a503eb
commit c245365484
2 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@ -65,6 +65,7 @@ what it is today.
 * A_Biondi
 * alex_carnell
 * Alan Webb (IBM)
+* Aleric
 * Allen Kerensky
 * BigFootAg
 * BlueWall Slade
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@ -86,7 +86,7 @@ namespace OpenSim.Services.MapImageService
                    {
                        Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH);
                        FillImage(waterTile, m_Watercolor);
-                        waterTile.Save(m_WaterTileFile);
+                        waterTile.Save(m_WaterTileFile, ImageFormat.Jpeg);
                    }
                }
            }