summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/llimage/llpngwrapper.cpp5
-rw-r--r--indra/llkdu/llimagej2ckdu.cpp5
2 files changed, 6 insertions, 4 deletions
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