diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Services/MapImageService/MapImageService.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/MapImageService/MapImageService.cs')
| -rw-r--r-- | OpenSim/Services/MapImageService/MapImageService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index e2f256f..31e147b 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
| @@ -86,7 +86,7 @@ namespace OpenSim.Services.MapImageService | |||
| 86 | { | 86 | { |
| 87 | Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); | 87 | Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); |
| 88 | FillImage(waterTile, m_Watercolor); | 88 | FillImage(waterTile, m_Watercolor); |
| 89 | waterTile.Save(m_WaterTileFile); | 89 | waterTile.Save(m_WaterTileFile, ImageFormat.Jpeg); |
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| 92 | } | 92 | } |