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/llappcorehttp.cpp | |
| parent | d0d07ccac565632497c50510714b30503be8aa94 (diff) | |
| parent | 9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappcorehttp.cpp')
| -rw-r--r-- | indra/newview/llappcorehttp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp index 49291ea564..dbcae57de7 100644 --- a/indra/newview/llappcorehttp.cpp +++ b/indra/newview/llappcorehttp.cpp @@ -534,7 +534,7 @@ LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url, // somewhat clumsy, as we may run into errors that do not map directly to curl // error codes. Should be refactored with login refactoring, perhaps. result = LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_SSL_CACERT); - result.setMessage(cert_exception.getMessage()); + result.setMessage(cert_exception.what()); LLPointer<LLCertificate> cert = cert_exception.getCert(); cert->ref(); // adding an extra ref here result.setErrorData(cert.get()); @@ -544,7 +544,7 @@ LLCore::HttpStatus LLAppCoreHttp::sslVerify(const std::string &url, catch (LLCertException &cert_exception) { result = LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_SSL_PEER_CERTIFICATE); - result.setMessage(cert_exception.getMessage()); + result.setMessage(cert_exception.what()); LLPointer<LLCertificate> cert = cert_exception.getCert(); cert->ref(); // adding an extra ref here result.setErrorData(cert.get()); |