Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into curlthreading3

Browse Source
This commit is contained in:
Aleric Inglewood
2012-09-22 01:26:37 +02:00
parent 1254a7bbe2 fb5ec1d1f5
commit a7cf09883e
5 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llappviewer.cpp
View File

@@ -1823,7 +1823,7 @@ bool LLAppViewer::initThreads()
LLWatchdog::getInstance()->init(watchdog_killer_callback);
}
AICurlInterface::startCurlThread();
AICurlInterface::startCurlThread(gSavedSettings.getU32("CurlConcurrentConnections"));
LLImage::initClass();