diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-20 00:25:34 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-20 00:25:34 +0200 |
commit | db8eb0f995889e222e38748dfee647058653e3f6 (patch) | |
tree | 39a67775fcb6af910a8519b73fa9f5c288204044 /indra/llcorehttp/_httpoprequest.cpp | |
parent | ccff36c8ee278129af3a8916bf931ab4ca14a76d (diff) | |
parent | 946b28ad765dc43ad6d1c715fa93a6f7c233ce64 (diff) |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llcorehttp/_httpoprequest.cpp')
-rw-r--r-- | indra/llcorehttp/_httpoprequest.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index db57869a1b..07cc0e4625 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -568,7 +568,17 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) // Use the viewer-based thread-safe API which has a // fast/safe check for proxy enable. Would like to // encapsulate this someway... - LLProxy::getInstance()->applyProxySettings(mCurlHandle); + if (LLProxy::instanceExists()) + { + // Make sure proxy won't be initialized from here, + // it might conflict with LLStartUp::startLLProxy() + LLProxy::getInstance()->applyProxySettings(mCurlHandle); + } + else + { + LL_WARNS() << "Proxy is not initialized!" << LL_ENDL; + } + } else if (gpolicy.mHttpProxy.size()) { |