diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs index c5efb4f..d66bbdb 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs | |||
@@ -170,10 +170,31 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
170 | 170 | ||
171 | ManagedImage managedImage; | 171 | ManagedImage managedImage; |
172 | Image image; | 172 | Image image; |
173 | if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image)) | 173 | |
174 | return new Bitmap(image); | 174 | try |
175 | else | 175 | { |
176 | return null; | 176 | if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image)) |
177 | return new Bitmap(image); | ||
178 | else | ||
179 | return null; | ||
180 | } | ||
181 | catch (DllNotFoundException) | ||
182 | { | ||
183 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system. Asset Data is emtpy for {0}", id); | ||
184 | |||
185 | } | ||
186 | catch (IndexOutOfRangeException) | ||
187 | { | ||
188 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", id); | ||
189 | |||
190 | } | ||
191 | catch (Exception) | ||
192 | { | ||
193 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", id); | ||
194 | |||
195 | } | ||
196 | return null; | ||
197 | |||
177 | } | 198 | } |
178 | 199 | ||
179 | // Compute the average color of a texture. | 200 | // Compute the average color of a texture. |