diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-29 12:23:28 -0400 |
| commit | 5a39c44b56191a4ba516d3c504b3a0a574156e72 (patch) | |
| tree | e95e5fc6cde0a046ac88abeba4a3410123cae890 /indra/llmessage/llhttpassetstorage.cpp | |
| parent | f5a890453b0a98636e6267b3272567ae0eecf1e4 (diff) | |
| parent | 68a15f73c190d2a803ad8b11ed8d9b32bc9e46ee (diff) | |
merged .hgtags
Diffstat (limited to 'indra/llmessage/llhttpassetstorage.cpp')
| -rw-r--r-- | indra/llmessage/llhttpassetstorage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llmessage/llhttpassetstorage.cpp b/indra/llmessage/llhttpassetstorage.cpp index 5a38b7fd9f..2bca517e97 100644 --- a/indra/llmessage/llhttpassetstorage.cpp +++ b/indra/llmessage/llhttpassetstorage.cpp @@ -33,6 +33,7 @@ #include "indra_constants.h" #include "message.h" +#include "llproxy.h" #include "llvfile.h" #include "llvfs.h" @@ -232,6 +233,10 @@ void LLHTTPAssetRequest::setupCurlHandle() { // *NOTE: Similar code exists in mapserver/llcurlutil.cpp JC mCurlHandle = curl_easy_init(); + + // Apply proxy settings if configured to do so + LLProxy::getInstance()->applyProxySettings(mCurlHandle); + curl_easy_setopt(mCurlHandle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1); curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer.c_str()); |