From 83eb9600631fcb98275b8d3db736f692fd5e6e1c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 17 Aug 2016 15:47:08 -0400
Subject: MAINT-5011: Derive image-load exceptions from LLContinueError.

Failure to load an image shouldn't crash the whole viewer.
---
 indra/llimage/llpngwrapper.cpp | 5 +++--
 indra/llkdu/llimagej2ckdu.cpp  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra')

diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp
index 640eda7b01..da289ea889 100644
--- a/indra/llimage/llpngwrapper.cpp
+++ b/indra/llimage/llpngwrapper.cpp
@@ -34,9 +34,10 @@
 #include "llexception.h"
 
 namespace {
-struct PngError: public LLException
+// Failure to load an image shouldn't crash the whole viewer.
+struct PngError: public LLContinueError
 {
-    PngError(png_const_charp msg): LLException(msg) {}
+    PngError(png_const_charp msg): LLContinueError(msg) {}
 };
 } // anonymous namespace
 
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp
index 341c47a268..4c2eac9eea 100644
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@@ -38,9 +38,10 @@
 #include <boost/exception/diagnostic_information.hpp>
 
 namespace {
-struct KDUError: public LLException
+// Failure to load an image shouldn't crash the whole viewer.
+struct KDUError: public LLContinueError
 {
-    KDUError(const std::string& msg): LLException(msg) {}
+    KDUError(const std::string& msg): LLContinueError(msg) {}
 };
 } // anonymous namespace
 
-- 
cgit v1.2.3