diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-15 14:32:55 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-15 14:32:55 -0400 |
| commit | 11dce3b74d60accd4d73aa976022daff637343d2 (patch) | |
| tree | b73503634eb271e0e53d2928a2ac0fd426831075 /indra/llmessage/llhttpassetstorage.cpp | |
| parent | 1b9a39a2e1050bb1366cce5f1140a1608633c473 (diff) | |
| parent | 671a76b40c0669cb8d4b08a6617ec33c47324a49 (diff) | |
reconciled .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()); |