svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h
index 1e799c18b9..971926b579 100644
--- a/indra/llmessage/llhttpnode.h
+++ b/indra/llmessage/llhttpnode.h
@@ -68,9 +68,10 @@ public:
 
 		class Response : public LLRefCount
 		{
-		public:
+		protected:
 			virtual ~Response();
 
+		public:
 			virtual void result(const LLSD&) = 0;
 			virtual void status(S32 code, const std::string& message) = 0;
 
@@ -205,7 +206,6 @@ class LLSimpleResponse : public LLHTTPNode::Response
 {
 public:
 	static LLPointer<LLSimpleResponse> create();
-	~LLSimpleResponse();
 	
 	void result(const LLSD& result);
 	void status(S32 code, const std::string& message);
@@ -215,6 +215,9 @@ public:
 	S32 mCode;
 	std::string mMessage;
 
+protected:
+	~LLSimpleResponse();
+
 private:
 	LLSimpleResponse() {;} // Must be accessed through LLPointer.
 };