From 1a55dd11f1e0c17452c3264ff02496d8ced8a421 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 21 Jan 2009 11:16:33 +0000
Subject: * 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)

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 92aae1a..72575e5 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -181,6 +181,17 @@ namespace OpenSim.Region.Physics.Meshing
                 {
                     ManagedImage managedImage;  // we never use this
                     OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata);
+                    
+                }
+                catch (DllNotFoundException)
+                {
+                    System.Console.WriteLine("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed.  Often times this is because of an old version of GLIBC.  You must have version 2.4 or above!");
+                    return null;
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    System.Console.WriteLine("[PHYSICS]: OpenJpeg was unable to decode this.   Physics Proxy generation failed");
+                    return null;
                 }
                 catch (Exception)
                 {
-- 
cgit v1.1