From 0274c1f2b16e571a0cc6295d1f3073b136210a7c Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Thu, 16 Jul 2009 17:54:58 +0000
Subject: Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. merged
 all changes, post copy, from the following branches:
 linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v

---
 indra/llmessage/llsdhttpserver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/llmessage/llsdhttpserver.cpp b/indra/llmessage/llsdhttpserver.cpp
index 00fc170c59..704c375ffc 100644
--- a/indra/llmessage/llsdhttpserver.cpp
+++ b/indra/llmessage/llsdhttpserver.cpp
@@ -62,7 +62,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
     
-	virtual LLSD get() const
+	virtual LLSD simpleGet() const
 	{
 		LLSD result = "hello";
 		return result;
@@ -86,7 +86,7 @@ public:
 		desc.source(__FILE__, __LINE__);
 	}
 	
-    virtual LLSD post(const LLSD& params) const
+	virtual LLSD simplePost(const LLSD& params) const
 	{
 		return params;
 	}
-- 
cgit v1.2.3