From ef34f73248465315afc17bea6a40288cf1c9b4e2 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Fri, 29 Feb 2008 22:50:17 +0000 Subject: svn merge -r 81153:81152 . (Undo of previous merge) --- indra/llmessage/llurlrequest.cpp | 5 ----- indra/llmessage/llurlrequest.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index d7812942c3..f850656785 100644 --- 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, 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