summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
commit10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch)
tree97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llappviewer.cpp
parente69efc8369a65008d41155717761fbaec0e309c5 (diff)
parent25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff)
merge from viewer-experience
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
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();