diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
| commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
| tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/newview/llsidepanelinventory.h | |
| parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
| parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) | |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index f80a3a9dd3..b7d11f7f9b 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -29,11 +29,13 @@ #include "llpanel.h" +class LLButton; class LLFolderViewItem; class LLInboxOutboxAddedObserver; class LLInventoryCategoriesObserver; class LLInventoryItem; class LLInventoryPanel; +class LLLayoutPanel; class LLPanelMainInventory; class LLSidepanelItemInfo; class LLSidepanelTaskInfo; @@ -58,7 +60,7 @@ public: LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any. LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; } BOOL isMainInventoryPanelActive() const; - + void clearSelections(bool clearMain, bool clearInbox, bool clearOutbox); std::set<LLUUID> getInboxOrOutboxSelectionList(); @@ -74,10 +76,11 @@ public: void enableInbox(bool enabled); void enableOutbox(bool enabled); - + bool isInboxEnabled() const { return mInboxEnabled; } bool isOutboxEnabled() const { return mOutboxEnabled; } + void updateOutboxUserStatus(); void updateVerbs(); protected: @@ -93,6 +96,8 @@ protected: void onInboxChanged(const LLUUID& inbox_id); void onOutboxChanged(const LLUUID& outbox_id); + bool manageInboxOutboxPanels(LLButton * pressedButton, LLLayoutPanel * pressedPanel, LLButton * otherButton, LLLayoutPanel * otherPanel); + // // UI Elements // |