summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpclient.h
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-06-13 18:02:37 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-06-13 18:02:37 +0000
commitf118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch)
treedb55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llmessage/llhttpclient.h
parent680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff)
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
Diffstat (limited to 'indra/llmessage/llhttpclient.h')
-rw-r--r--indra/llmessage/llhttpclient.h8
1 files changed, 7 insertions, 1 deletions
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 <boost/intrusive_ptr.hpp>
#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: