diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-17 11:41:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-17 11:41:12 -0400 |
| commit | e72bdc9bc5895267f77bf3eac8d68f82f5e2806b (patch) | |
| tree | bb86f9ae3e199a994ec5e2255d9af0de3fa17c95 /indra/newview/llsecapi.cpp | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
| parent | 5e9d2f57c82a57307a48afea09aa539b9fa80abf (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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..933f7bb16e 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 "llexception.h" #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()); + LLTHROW(LLProtectedDataException(exception_msg)); } } |