From aa2b978bf59dd74083bec86c61a29fefb4ebb14c Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Tue, 24 Feb 2009 19:29:36 +0000 Subject: merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk --- indra/llmessage/llhttpnode.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'indra/llmessage/llhttpnode.h') diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h index a6f14f6545..4f80db47f1 100644 --- a/indra/llmessage/llhttpnode.h +++ b/indra/llmessage/llhttpnode.h @@ -38,7 +38,6 @@ class LLChainIOFactory; - /** * These classes represent the HTTP framework: The URL tree, and the LLSD * REST interface that such nodes implement. @@ -100,6 +99,11 @@ public: */ virtual void result(const LLSD&) = 0; + /** + * @brief return status code and message with headers. + */ + virtual void extendedResult(S32 code, const std::string& message, const LLSD& headers) = 0; + /** * @brief return status code and reason string on http header, * but do not return a payload. @@ -218,6 +222,14 @@ public: const LLHTTPNode* rootNode() const; const LLHTTPNode* findNode(const std::string& name) const; + + enum EHTTPNodeContentType + { + CONTENT_TYPE_LLSD, + CONTENT_TYPE_TEXT + }; + + virtual EHTTPNodeContentType getContentType() const { return CONTENT_TYPE_LLSD; } //@} /* @name Description system @@ -277,6 +289,7 @@ public: static LLPointer create(); void result(const LLSD& result); + void extendedResult(S32 code, const std::string& body, const LLSD& headers); void status(S32 code, const std::string& message); void print(std::ostream& out) const; -- cgit v1.2.3