diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs index 59d29d6..e9fe373 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -275,7 +275,19 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture | |||
275 | 275 | ||
276 | Bitmap joint = MergeBitMaps(image1, image2); | 276 | Bitmap joint = MergeBitMaps(image1, image2); |
277 | 277 | ||
278 | return OpenJPEG.EncodeFromImage(joint, true); | 278 | byte[] result = new byte[0]; |
279 | |||
280 | try | ||
281 | { | ||
282 | result = OpenJPEG.EncodeFromImage(joint, true); | ||
283 | } | ||
284 | catch (Exception) | ||
285 | { | ||
286 | Console.WriteLine( | ||
287 | "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | ||
288 | } | ||
289 | |||
290 | return result; | ||
279 | } | 291 | } |
280 | } | 292 | } |
281 | 293 | ||