diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
| commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
| tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/newview/llappviewer.cpp | |
| parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d185215a9e..7706cd789f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -45,6 +45,8 @@ #include "llwindow.h" #include "llviewerstats.h" #include "llviewerstatsrecorder.h" +#include "llmarketplacefunctions.h" +#include "llmarketplacenotifications.h" #include "llmd5.h" #include "llmeshrepository.h" #include "llpumpio.h" @@ -722,7 +724,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(); @@ -4418,6 +4422,10 @@ void LLAppViewer::idle() // update media focus LLViewerMediaFocus::getInstance()->update(); + + // Update marketplace + LLMarketplaceInventoryImporter::update(); + LLMarketplaceInventoryNotifications::update(); // objects and camera should be in sync, do LOD calculations now { |