diff options
| author | Signal Linden <signal@lindenlab.com> | 2022-10-10 10:01:10 -0700 |
|---|---|---|
| committer | Signal Linden <signal@lindenlab.com> | 2022-10-10 10:01:10 -0700 |
| commit | 977d7e9ea0c6b04b085704a4a7b64244522e770c (patch) | |
| tree | 80849436f1961ea58839808366dd1b3e2d07928f /indra/newview/llxmlrpclistener.cpp | |
| parent | f2f9b32e753972d83087b9201a0073e208a0dd75 (diff) | |
| parent | 7018deb7f8bc22bdbab7be29896c92ec648a3f2f (diff) | |
Merge remote-tracking branch 'bb/DRTVWR-568' into actions
Diffstat (limited to 'indra/newview/llxmlrpclistener.cpp')
| -rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 4401f61059..b816f9a3b5 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -38,7 +38,13 @@ // external library headers #include <boost/scoped_ptr.hpp> #include <boost/range.hpp> // boost::begin(), boost::end() + +#ifdef LL_USESYSTEMLIBS +#include <xmlrpc.h> +#else #include <xmlrpc-epi/xmlrpc.h> +#endif + #include "curl/curl.h" // other Linden headers @@ -343,7 +349,9 @@ public: switch (curlcode) { +#if CURLE_SSL_PEER_CERTIFICATE != CURLE_SSL_CACERT case CURLE_SSL_PEER_CERTIFICATE: +#endif case CURLE_SSL_CACERT: data["certificate"] = mTransaction->getErrorCertData(); break; |