diff options
| author | Justin Clark-Casey (justincc) | 2011-11-02 18:40:49 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-02 18:40:49 +0000 |
| commit | 72923134e9ab9ab946253c883d40536af389ab18 (patch) | |
| tree | 85ace652ccbb56a7cd5d79c9a9b98f03c28ca515 | |
| parent | Fix race condition that would sometimes send or save appearance for the wrong... (diff) | |
| download | opensim-SC_OLD-72923134e9ab9ab946253c883d40536af389ab18.zip opensim-SC_OLD-72923134e9ab9ab946253c883d40536af389ab18.tar.gz opensim-SC_OLD-72923134e9ab9ab946253c883d40536af389ab18.tar.bz2 opensim-SC_OLD-72923134e9ab9ab946253c883d40536af389ab18.tar.xz | |
Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 6075e19..f2c8b3d 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
| @@ -395,9 +395,11 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
| 395 | { | 395 | { |
| 396 | result = OpenJPEG.EncodeFromImage(joint, true); | 396 | result = OpenJPEG.EncodeFromImage(joint, true); |
| 397 | } | 397 | } |
| 398 | catch (Exception) | 398 | catch (Exception e) |
| 399 | { | 399 | { |
| 400 | m_log.Error("[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | 400 | m_log.ErrorFormat( |
| 401 | "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Exception {0}{1}", | ||
| 402 | e.Message, e.StackTrace); | ||
| 401 | } | 403 | } |
| 402 | 404 | ||
| 403 | return result; | 405 | return result; |
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 7316e5b..c061868 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
| @@ -338,10 +338,11 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
| 338 | { | 338 | { |
| 339 | imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); | 339 | imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); |
| 340 | } | 340 | } |
| 341 | catch (Exception) | 341 | catch (Exception e) |
| 342 | { | 342 | { |
| 343 | m_log.Error( | 343 | m_log.ErrorFormat( |
| 344 | "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | 344 | "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Exception {0}{1}", |
| 345 | e.Message, e.StackTrace); | ||
| 345 | } | 346 | } |
| 346 | 347 | ||
| 347 | m_textureManager.ReturnData(id, imageJ2000); | 348 | m_textureManager.ReturnData(id, imageJ2000); |