diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
| commit | 31009296bb8658155b1622395f9a0e9eb2ab3a51 (patch) | |
| tree | 4bcacc043c143079a0e70cb0aa22ad2c444674d1 /indra/newview/llsecapi.cpp | |
| parent | d0d07ccac565632497c50510714b30503be8aa94 (diff) | |
| parent | 9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsecapi.cpp')
| -rw-r--r-- | indra/newview/llsecapi.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp index 4f9f83b6f2..bcb9417820 100644 --- a/indra/newview/llsecapi.cpp +++ b/indra/newview/llsecapi.cpp @@ -29,6 +29,7 @@ #include "llviewerprecompiledheaders.h" #include "llsecapi.h" #include "llsechandler_basic.h" +#include <boost/throw_exception.hpp> #include <openssl/evp.h> #include <openssl/err.h> #include <map> @@ -64,12 +65,12 @@ void initializeSecHandler() } catch (LLProtectedDataException e) { - exception_msg = e.getMessage(); + exception_msg = e.what(); } } if (!exception_msg.empty()) // an exception was thrown. { - throw LLProtectedDataException(exception_msg.c_str()); + BOOST_THROW_EXCEPTION(LLProtectedDataException(exception_msg)); } } |