diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-02-29 22:50:17 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-02-29 22:50:17 +0000 |
| commit | ef34f73248465315afc17bea6a40288cf1c9b4e2 (patch) | |
| tree | 06a2348990a490ccb5aef282a1ebe4dee7aa5171 | |
| parent | 0ff5c1bd1b5b047f5d48102b4c21d461170a6118 (diff) | |
svn merge -r 81153:81152 .
(Undo of previous merge)
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 5 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.h | 5 |
2 files changed, 0 insertions, 10 deletions
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 |