From ef34f73248465315afc17bea6a40288cf1c9b4e2 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Fri, 29 Feb 2008 22:50:17 +0000
Subject: svn merge -r 81153:81152 .

(Undo of previous merge)
---
 indra/llmessage/llurlrequest.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'indra/llmessage/llurlrequest.h')

diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 288bf463f5..b154794ff1 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -166,11 +166,6 @@ public:
      */
     void useProxy(bool use_proxy);
 
-    /**
-     * @ brief Set the CURLOPT_PROXY header to the given value.
-     */
-	void useProxy(const std::string& proxy);
-
 public:
 	/** 
 	 * @brief Give this pipe a chance to handle a generated error
-- 
cgit v1.2.3