diff options
| author | prep <none@none> | 2012-01-31 15:13:16 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-01-31 15:13:16 -0500 |
| commit | 9e1479d610af1edd799a790ff18155fbb6ec5c89 (patch) | |
| tree | f086f457880855cac99059c1868b5dcd40a5185b /indra/newview/llappviewer.cpp | |
| parent | 8f6524d999d5153ff4b89abafb35bc96870d6230 (diff) | |
| parent | 2c9a68c036eec1d1a021df305bf032d0c78da139 (diff) | |
merge
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 172eb834b4..261553599b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -723,7 +723,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(); |