diff options
author | Teravus Ovares | 2009-01-21 11:16:33 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-01-21 11:16:33 +0000 |
commit | 1a55dd11f1e0c17452c3264ff02496d8ced8a421 (patch) | |
tree | a358deb7a59b1a46075b1dc5adf7f359edb3151c /OpenSim/Region/Physics/Meshing | |
parent | - remove extra "; in http_loginform.html.example; fix issue 3025 (diff) | |
download | opensim-SC_OLD-1a55dd11f1e0c17452c3264ff02496d8ced8a421.zip opensim-SC_OLD-1a55dd11f1e0c17452c3264ff02496d8ced8a421.tar.gz opensim-SC_OLD-1a55dd11f1e0c17452c3264ff02496d8ced8a421.tar.bz2 opensim-SC_OLD-1a55dd11f1e0c17452c3264ff02496d8ced8a421.tar.xz |
* 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)
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 11 |
1 files changed, 11 insertions, 0 deletions
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 | |||
181 | { | 181 | { |
182 | ManagedImage managedImage; // we never use this | 182 | ManagedImage managedImage; // we never use this |
183 | OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata); | 183 | OpenJPEG.DecodeToImage(primShape.SculptData, out managedImage, out idata); |
184 | |||
185 | } | ||
186 | catch (DllNotFoundException) | ||
187 | { | ||
188 | 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!"); | ||
189 | return null; | ||
190 | } | ||
191 | catch (IndexOutOfRangeException) | ||
192 | { | ||
193 | System.Console.WriteLine("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed"); | ||
194 | return null; | ||
184 | } | 195 | } |
185 | catch (Exception) | 196 | catch (Exception) |
186 | { | 197 | { |