diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
| commit | fd56967dea7e4c53080a1ef89cc550492baf3fc8 (patch) | |
| tree | 2a7a7993a550afbd7e92975cc53d633e41404583 /indra/newview/llappviewer.cpp | |
| parent | c4084c71386e34f6c28d4c10199eaf1155a2855b (diff) | |
| parent | 56973912198ba3410d1ab32d1a8a63a1c8c3348e (diff) | |
Merge with latest
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 { |