diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 22:22:21 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 22:22:21 +0000 |
commit | 364ba9978b42ca03c39ee63c23fc1378e410ca96 (patch) | |
tree | a5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/newview/tests | |
parent | b62d7c2f06fdaa91312fd6857d03748defe8b60f (diff) | |
parent | 86e7cc3d35e41a88b25175bafb5687e1864423d9 (diff) |
Merged in DV497-merge-6.4.9 (pull request #312)
Merge 6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llsechandler_basic_test.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index 63967fae37..e5d226a2a4 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -124,6 +124,14 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len) S32 LLMachineID::init() { return 1; } +LLCertException::LLCertException(const LLSD& cert_data, const std::string& msg) + : LLException(msg), + mCertData(cert_data) +{ + LL_WARNS("SECAPI") << "Certificate Error: " << msg << LL_ENDL; +} + + // ------------------------------------------------------------------------------------------- // TUT // ------------------------------------------------------------------------------------------- |