From f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Wed, 13 Jun 2007 18:02:37 +0000 Subject: result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release --- indra/llmessage/llhttpclient.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/llmessage/llhttpclient.h') diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index f2674ba417..447bd691ba 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -18,6 +18,8 @@ #include #include "llassettype.h" +#include "llbuffer.h" +#include "lliopipe.h" extern const F32 HTTP_REQUEST_EXPIRY_SECS; @@ -38,7 +40,11 @@ public: virtual void error(U32 status, const std::string& reason); // called with bad status codes virtual void result(const LLSD& content); - + + // Override point for clients that may want to use this class when the response is some other format besides LLSD + virtual void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, + const LLIOPipe::buffer_ptr_t& buffer); + virtual void completed(U32 status, const std::string& reason, const LLSD& content); /**< The default implemetnation calls either: -- cgit v1.2.3