diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:23:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-30 10:23:06 -0500 |
| commit | 9bbaf3ab14cf131a1938455c99d3cf0f4abc176c (patch) | |
| tree | 4292dd5c7fe667ef23e8c0ed821c973818726363 /indra/newview/llappviewer.cpp | |
| parent | a2544b18e8e1d49092a32833ddfc39826d1a5495 (diff) | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 40136adbc9..a455d359bf 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" @@ -4404,6 +4406,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 { |