diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
commit | ace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch) | |
tree | 2d437342310d52806c6b378f1046ad56d9eb6456 /indra/newview/llxmlrpclistener.cpp | |
parent | 90bb29245cbd9626f840f1d16c351ac415f7c35e (diff) | |
parent | 1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff) |
merge with avp-tip
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llxmlrpclistener.cpp')
-rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index af8cb6b9fb..15417614af 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -21,13 +21,14 @@ // external library headers #include <boost/scoped_ptr.hpp> #include <boost/range.hpp> // boost::begin(), boost::end() +#include <xmlrpc-epi/xmlrpc.h> +#include "curl/curl.h" + // other Linden headers #include "llerror.h" #include "stringize.h" #include "llxmlrpctransaction.h" -#include <xmlrpc-epi/xmlrpc.h> - #if LL_WINDOWS #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally #endif |