diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-15 20:05:28 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-15 20:05:28 -0400 |
| commit | 61a7a874aa699d0549eb6aef2ee79ee81a384bdb (patch) | |
| tree | f4453bf7a005ea2100d915045d5c1951d9feb0a4 /indra | |
| parent | ff870e977034cc17292aeb8d274ed553c7b2e3e3 (diff) | |
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index d5400e4169..a186596582 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -438,6 +438,7 @@ 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); |