svn merge -r 81153:81152 .

(Undo of previous merge)
2008-02-29 22:50:17 +00:00 · 2008-02-29 22:50:17 +00:00 · ef34f73248
parent 0ff5c1bd1b
commit ef34f73248
2 changed files with 0 additions and 10 deletions
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@ -192,11 +192,6 @@ void LLURLRequest::useProxy(bool use_proxy)
    }
 }

-void LLURLRequest::useProxy(const std::string &proxy)
-{
-	curl_easy_setopt(mDetail->mCurl, CURLOPT_PROXY, proxy.c_str());
-}
-
 // virtual
 LLIOPipe::EStatus LLURLRequest::handleError(
 	LLIOPipe::EStatus status,
--- 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