- More include changes for xmlrpc.h

- New versions of curl have the same value for CURLE_SSL_PEER_CERTIFICATE and  CURLE_SSL_CACERT

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 @@ class Poller
 		
 		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;

indra/newview/llxmlrpctransaction.cpp

@@ -43,7 +43,12 @@
 #include "llviewercontrol.h"
 
 // Have to include these last to avoid queue redefinition!
+
+#ifdef LL_USESYSTEMLIBS
+#include <xmlrpc.h>
+#else
 #include <xmlrpc-epi/xmlrpc.h>
+#endif
 
 #include "llappviewer.h"
 #include "lltrans.h"
@@ -498,10 +503,11 @@ void LLXMLRPCTransaction::Impl::setHttpStatus(const LLCore::HttpStatus &status)
 		message = LLTrans::getString("couldnt_resolve_host", args);
 		break;
 
+#if CURLE_SSL_PEER_CERTIFICATE != CURLE_SSL_CACERT
 	case CURLE_SSL_PEER_CERTIFICATE:
 		message = LLTrans::getString("ssl_peer_certificate");
 		break;
-
+#endif
 	case CURLE_SSL_CACERT:
 	case CURLE_SSL_CONNECT_ERROR:		
 		message = LLTrans::getString("ssl_connect_error");