diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
commit | ca3cea390ca44e6e6c390b390e0ebdfafd2afa9e (patch) | |
tree | 005b934f87b6c5adc0a6f84ef6f12c67d606ce37 /indra/newview/llappviewer.cpp | |
parent | 1d9fe077a64d36272b32ae0fb1888d2b25aa1d43 (diff) | |
parent | 5451af6cca43f296e1b5654ab3e611928929c1c9 (diff) |
merge changes for storm-1537 : releasable mesh branch
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b65933f8a1..d12b971bde 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -708,7 +708,7 @@ bool LLAppViewer::init() // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. - LLCurl::initClass(); + LLCurl::initClass(gSavedSettings.getBOOL("CurlUseMultipleThreads")); LL_INFOS("InitInfo") << "LLCurl initialized." << LL_ENDL ; LLMachineID::init(); |