diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-01 17:50:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-01 17:50:43 -0500 |
| commit | fbd5bd7adc205acecc49c7e9887efa3bca6552d0 (patch) | |
| tree | 6fb12e7666ad09224a37c53556298a43c2bfc1a6 /indra/newview | |
| parent | c6ee98394e3d4b90bdffb4c84d03afc8d3d2d955 (diff) | |
SH-2183 Add a debug setting to control whether or not to use multiple threads in LLCurl
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7330c76b01..2b38a8028c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1803,6 +1803,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>CurlUseMultipleThreads</key> + <map> + <key>Comment</key> + <string>Use background threads for executing curl_multi_perform (requires restart)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>Cursor3D</key> <map> <key>Comment</key> 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(); |