diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-30 15:48:44 -0500 |
| commit | 1ed8faee81804af2f0640784191f1deadfa9f50c (patch) | |
| tree | 1bbee24e0c0c388b1f0544145db8eff1588546f7 /indra/newview/llappviewer.cpp | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
| parent | 717a6f3306d9382ea252c3e0f243b785c9cae15a (diff) | |
merge changes for vmrg-219
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a455d359bf..49fbdbf1df 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -722,7 +722,9 @@ bool LLAppViewer::init() // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. - LLCurl::initClass(gSavedSettings.getBOOL("CurlUseMultipleThreads")); + LLCurl::initClass(gSavedSettings.getF32("CurlRequestTimeOut"), + gSavedSettings.getS32("CurlMaximumNumberOfHandles"), + gSavedSettings.getBOOL("CurlUseMultipleThreads")); LL_INFOS("InitInfo") << "LLCurl initialized." << LL_ENDL ; LLMachineID::init(); |