diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 15:59:37 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-01-25 15:59:37 -0500 |
| commit | 50b67f052a440fba54a05fe32320f6bb84ea43cc (patch) | |
| tree | e9716527ab736c1d5c92e0d1a4ee11cb071c522f /indra/newview/llappviewer.cpp | |
| parent | c4e0c20cdccc0604a1688ab3664295c1944321e8 (diff) | |
| parent | 4ef9277761b5faee2825177112939b72c563a4ea (diff) | |
MERGE - pulling latest viewer-development into pathfinding branch
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 { |