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
 	{