diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-09 16:19:03 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-09 16:19:03 -0800 |
| commit | cc92db1f353de96f6d27863b92671b2d847536f4 (patch) | |
| tree | 75dccadc2f25115712cd48040bb11c5c424ee196 /indra/newview/llfloateroutbox.h | |
| parent | 8878a5e561f292a8afcd933eaafb2c4c65b7bf7f (diff) | |
Moved outbox import confirmations to window shades on the merchant outbox floater, rather than modal dialogs.
Diffstat (limited to 'indra/newview/llfloateroutbox.h')
| -rw-r--r-- | indra/newview/llfloateroutbox.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h index 3d2ce86144..8023434675 100644 --- a/indra/newview/llfloateroutbox.h +++ b/indra/newview/llfloateroutbox.h @@ -30,6 +30,7 @@ #include "llfloater.h" #include "llfoldertype.h" +#include "llnotificationptr.h" class LLButton; @@ -37,8 +38,10 @@ class LLInventoryCategoriesObserver; class LLInventoryCategoryAddedObserver; class LLInventoryPanel; class LLLoadingIndicator; +class LLNotification; class LLTextBox; class LLView; +class LLWindowShade; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -55,12 +58,15 @@ public: // virtuals BOOL postBuild(); + void onClose(bool app_quitting); void onOpen(const LLSD& key); BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); + + void showNotification(LLNotificationPtr notify); protected: void importReportResults(U32 status, const LLSD& content); @@ -86,6 +92,8 @@ private: LLTextBox * mInventoryTitle; LLButton * mImportButton; + + LLWindowShade * mWindowShade; }; #endif // LL_LLFLOATEROUTBOX_H |