* More friendly OpenJpeg error handling.

* Often times now the only reason OpenJpeg doesn't work is because it requires Glibc 2.4    The error messages reflect that.
* In J2kDecoder module, It stops trying to decode modules if it encounters a dllnotfound exception and instead sends a full resolution layer that causes the texture sender to only send the full resolution image.  (big decrease in texture download speed, but it's better then nasty repeating error messages)

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
 
                         Bitmap joint = MergeBitMaps(image1, image2);
 
-                        return OpenJPEG.EncodeFromImage(joint, true);
+                        byte[] result = new byte[0];
+
+                        try
+                        {
+                            result = OpenJPEG.EncodeFromImage(joint, true);
+                        } 
+                        catch (Exception)
+                        {
+                            Console.WriteLine(
+                                "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
+                        }
+
+                        return result;
                     }
                 }