3 files changed, 35 insertions, 3 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;
                     }
                 }
 
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 631051b..eeeb3ca 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -168,7 +168,17 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
                     }
 
                     Bitmap resize = new Bitmap(image, newsize);
-                    byte[] imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
+                    byte[] imageJ2000 = new byte[0];
+                    
+                    try
+                    {
+                        imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
+                    } 
+                    catch (Exception)
+                    {
+                        Console.WriteLine(
+                            "[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
+                    }
 
                     m_textureManager.ReturnData(state.RequestID, imageJ2000);
                 }
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
index f8a9879..ffbc262 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
@@ -169,7 +169,17 @@ namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender
 
             GDIDraw(data, graph);
 
-            byte[] imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true);
+            byte[] imageJ2000 = new byte[0];
+
+            try
+            {
+                imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true);
+            }
+            catch (Exception)
+            {
+                Console.WriteLine(
+                    "[VECTORRENDERMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
+            }
             m_textureManager.ReturnData(id, imageJ2000);
         }