diff options
author | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-01-24 16:21:34 -0500 |
commit | b2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch) | |
tree | 7695bb632502f24325f7044c69e30946e767abce /indra/newview/llappviewer.cpp | |
parent | 79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff) | |
parent | ea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff) |
merge changes for vmrg-217
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 { |