From b5936a4b1d8780b5b8cd425998eacd2c64ffa693 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 3 Apr 2008 19:21:14 +0000
Subject: 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 QAR_367 (RC1)
 - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) -
 merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge
 Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge
 Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793
 Branch_1-19-1-Viewer-merge@83953 -> release)

---
 indra/llmessage/llhttpnode.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'indra/llmessage/llhttpnode.cpp')

diff --git a/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp
index 1289b63d79..b82bd65d2e 100644
--- a/indra/llmessage/llhttpnode.cpp
+++ b/indra/llmessage/llhttpnode.cpp
@@ -168,16 +168,10 @@ void LLHTTPNode::del(LLHTTPNode::ResponsePtr response, const LLSD& context) cons
 
 }
 
-// virtual
-LLSD LLHTTPNode::del() const
-{
-	throw NotImplemented();
-}
-
 // virtual
 LLSD LLHTTPNode::del(const LLSD&) const
 {
-	return del();
+	throw NotImplemented();
 }
 
 
-- 
cgit v1.2.3