summaryrefslogtreecommitdiff
path: root/indra/newview/llsecapi.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-07-19 16:25:25 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-07-19 16:25:25 -0400
commit9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (patch)
treeac1d2b5683b0df287448373b79092981115d9410 /indra/newview/llsecapi.h
parent47d93e4f65493977217cfed53ff68eb926cf9bb7 (diff)
MAINT-5011: Introduce LLException base class for viewer exceptions.
This also introduces LLContinueError for exceptions which should interrupt some part of viewer processing (e.g. the current coroutine) but should attempt to let the viewer session proceed. Derive all existing viewer exception classes from LLException rather than from std::runtime_error or std::logic_error. Use BOOST_THROW_EXCEPTION() rather than plain 'throw' to enrich the thrown exception with source file, line number and containing function.
Diffstat (limited to 'indra/newview/llsecapi.h')
-rw-r--r--indra/newview/llsecapi.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h
index 535a112638..6af5a28fa5 100644
--- a/indra/newview/llsecapi.h
+++ b/indra/newview/llsecapi.h
@@ -32,7 +32,7 @@
#include <openssl/x509.h>
#include <ostream>
#include "llpointer.h"
-#include <stdexcept>
+#include "llexception.h"
#ifdef LL_WINDOWS
#pragma warning(disable:4250)
@@ -117,10 +117,10 @@
-struct LLProtectedDataException: public std::runtime_error
+struct LLProtectedDataException: public LLException
{
LLProtectedDataException(const std::string& msg):
- std::runtime_error(msg)
+ LLException(msg)
{
LL_WARNS("SECAPI") << "Protected Data Error: " << msg << LL_ENDL;
}
@@ -331,11 +331,11 @@ std::ostream& operator <<(std::ostream& s, const LLCredential& cred);
// All error handling is via exceptions.
-class LLCertException: public std::runtime_error
+class LLCertException: public LLException
{
public:
LLCertException(LLPointer<LLCertificate> cert, const std::string& msg):
- std::runtime_error(msg)
+ LLException(msg)
{
mCert = cert;