diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
| commit | 10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch) | |
| tree | 97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llsidepanelinventory.h | |
| parent | e69efc8369a65008d41155717761fbaec0e309c5 (diff) | |
| parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) | |
merge from viewer-experience
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index d00cd05d54..ebbb10936a 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -61,6 +61,9 @@ public: LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; } BOOL isMainInventoryPanelActive() const; + void clearSelections(bool clearMain, bool clearInbox, bool clearOutbox); + std::set<LLUUID> getInboxOrOutboxSelectionList(); + void showItemInfoPanel(); void showTaskInfoPanel(); void showInventoryPanel(); @@ -99,6 +102,8 @@ protected: // private: LLPanel* mInventoryPanel; // Main inventory view + LLInventoryPanel* mInventoryPanelInbox; + LLInventoryPanel* mInventoryPanelOutbox; LLSidepanelItemInfo* mItemPanel; // Individual item view LLSidepanelTaskInfo* mTaskPanel; // Individual in-world object view LLPanelMainInventory* mPanelMainInventory; |