summaryrefslogtreecommitdiff
path: root/indra/newview/llxmlrpctransaction.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-02-13 13:58:23 +0000
commit2b7966302131975e8d270bbf2985b678f37d4b24 (patch)
tree69d01a92eeaa5de292673bc4506f1d0932d3d607 /indra/newview/llxmlrpctransaction.cpp
parentdec077e54a21ccda7d7cc0b610a87eacfd36af09 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
merge
Diffstat (limited to 'indra/newview/llxmlrpctransaction.cpp')
-rw-r--r--indra/newview/llxmlrpctransaction.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 0c8495a6e4..143c97fca4 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -206,7 +206,7 @@ public:
std::string mResponseText;
XMLRPC_REQUEST mResponse;
std::string mCertStore;
- LLPointer<LLCertificate> mErrorCert;
+ LLSD mErrorCertData;
Impl(const std::string& uri, XMLRPC_REQUEST request, bool useGzip, const LLSD& httpParams);
Impl(const std::string& uri,
@@ -247,14 +247,8 @@ void LLXMLRPCTransaction::Handler::onCompleted(LLCore::HttpHandle handle,
// (a non cert error), then generate the error message as
// appropriate
mImpl->setHttpStatus(status);
- LLCertificate *errordata = static_cast<LLCertificate *>(status.getErrorData());
-
- if (errordata)
- {
- mImpl->mErrorCert = LLPointer<LLCertificate>(errordata);
- status.setErrorData(NULL);
- errordata->unref();
- }
+ LLSD errordata = status.getErrorData();
+ mImpl->mErrorCertData = errordata;
LL_WARNS() << "LLXMLRPCTransaction error "
<< status.toHex() << ": " << status.toString() << LL_ENDL;
@@ -573,9 +567,9 @@ std::string LLXMLRPCTransaction::statusMessage()
return impl.mStatusMessage;
}
-LLPointer<LLCertificate> LLXMLRPCTransaction::getErrorCert()
+LLSD LLXMLRPCTransaction::getErrorCertData()
{
- return impl.mErrorCert;
+ return impl.mErrorCertData;
}
std::string LLXMLRPCTransaction::statusURI()