diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 14:59:18 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 14:59:18 -0800 |
| commit | e4b63c96b83a1ed8c18946ecd64c21d6bd7c26fe (patch) | |
| tree | d9c5e7a8f15a8d7fa3bf1d20aded3dee34a7f058 /indra/newview/llappviewer.cpp | |
| parent | accf83394513c82e98fffa15bc0131ee25f63f00 (diff) | |
EXP-1804 FIX -- Drag and drop operations can be blocked by modal dialogs
* Added support for marketplace notifications that don't display the dialog
until the next frame, leaving room for the drag and drop operation to
properly complete before the notification shows up and interferes.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5c51f1b11a..a455d359bf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -46,6 +46,7 @@ #include "llviewerstats.h" #include "llviewerstatsrecorder.h" #include "llmarketplacefunctions.h" +#include "llmarketplacenotifications.h" #include "llmd5.h" #include "llmeshrepository.h" #include "llpumpio.h" @@ -4406,8 +4407,9 @@ void LLAppViewer::idle() // update media focus LLViewerMediaFocus::getInstance()->update(); - // Update marketplace importer + // Update marketplace LLMarketplaceInventoryImporter::update(); + LLMarketplaceInventoryNotifications::update(); // objects and camera should be in sync, do LOD calculations now { |