diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
commit | d0811218381cfa9d201d7b72532e19d98bda250a (patch) | |
tree | 65d3c325feeac71171813d3302bd1c4517b22cb2 /indra/newview/llxmlrpclistener.cpp | |
parent | cc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff) | |
parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llxmlrpclistener.cpp')
-rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 99070d5bee..7bc8af4a0b 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -379,14 +379,9 @@ public: { case CURLE_SSL_PEER_CERTIFICATE: case CURLE_SSL_CACERT: - { - LLPointer<LLCertificate> error_cert(mTransaction->getErrorCert()); - if(error_cert) - { - data["certificate"] = error_cert->getPem(); - } + data["certificate"] = mTransaction->getErrorCertData(); break; - } + default: break; } |