summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-16 17:35:16 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-16 17:35:16 -0400
commit797b4df42a17f0674a1ac64946deca50b726e523 (patch)
treec60b4be78e66dd4544f5033516eb63a3c87613f3 /indra
parent61a7a874aa699d0549eb6aef2ee79ee81a384bdb (diff)
Backed out changeset 694594710de2
Diffstat (limited to 'indra')
-rw-r--r--indra/llmessage/llurlrequest.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index a186596582..d5400e4169 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -438,7 +438,6 @@ void LLURLRequest::initialize()
LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
mState = STATE_INITIALIZED;
mDetail = new LLURLRequestDetail;
- LLProxy::getInstance()->applyProxySettings(mDetail->mCurlRequest);
mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);