diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-02 12:23:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-02 12:23:50 -0500 |
| commit | aa0e35142a35d293acc439e3194260bb4468e728 (patch) | |
| tree | bf9ab217b04f5e277e11a0d1189a986b4bfcbe6f /indra | |
| parent | fbd5bd7adc205acecc49c7e9887efa3bca6552d0 (diff) | |
SH-2183 Only apply multi-threaded curl on the main thread.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 3 | ||||
| -rw-r--r-- | indra/llmessage/llcurl.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index ece539bb48..d48991e5f7 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -85,7 +85,8 @@ S32 gCurlMultiCount = 0; std::vector<LLMutex*> LLCurl::sSSLMutex; std::string LLCurl::sCAPath; std::string LLCurl::sCAFile; -bool LLCurl::sMultiThreaded = false; + +bool ll_thread_local LLCurl::sMultiThreaded = false; void check_curl_code(CURLcode code) diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h index b2c7b36a76..52810bac73 100644 --- a/indra/llmessage/llcurl.h +++ b/indra/llmessage/llcurl.h @@ -41,6 +41,7 @@ #include "llbuffer.h" #include "lliopipe.h" #include "llsd.h" +#include "llthread.h" class LLMutex; @@ -55,7 +56,7 @@ public: class Easy; class Multi; - static bool sMultiThreaded; + static bool ll_thread_local sMultiThreaded; struct TransferInfo { |