diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-09 12:29:33 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-09 12:29:33 -0800 |
| commit | 8878a5e561f292a8afcd933eaafb2c4c65b7bf7f (patch) | |
| tree | 427e6edd7f36ee83cb4b1e937bd6f26a0f876a81 /indra/newview/llsidepanelinventory.h | |
| parent | a7b04c9dd44274b3548402de2f4a9b8bc20e3e50 (diff) | |
* Changed background opacity of outbox and inventory to match.
* Removed superfluous marketplace layout stack, leftover from inbox/outbox in same inventory window.
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rw-r--r-- | indra/newview/llsidepanelinventory.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index 915db727d6..a33607f50d 100644 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -31,7 +31,7 @@ class LLButton; class LLFolderViewItem; -class LLInboxOutboxAddedObserver; +class LLInboxAddedObserver; class LLInventoryCategoriesObserver; class LLInventoryItem; class LLInventoryPanel; @@ -47,10 +47,10 @@ public: virtual ~LLSidepanelInventory(); private: - void updateInboxOutbox(); + void updateInbox(); public: - void observeInboxOutboxCreation(); + void observeInboxCreation(); void observeInboxModifications(const LLUUID& inboxID); /*virtual*/ BOOL postBuild(); @@ -63,7 +63,7 @@ public: BOOL isMainInventoryPanelActive() const; void clearSelections(bool clearMain, bool clearInbox); - std::set<LLUUID> getInboxOrOutboxSelectionList(); + std::set<LLUUID> getInboxSelectionList(); void showItemInfoPanel(); void showTaskInfoPanel(); @@ -94,8 +94,6 @@ protected: void onInboxChanged(const LLUUID& inbox_id); - bool manageInboxOutboxPanels(LLButton * pressedButton, LLLayoutPanel * pressedPanel); - // // UI Elements // @@ -127,8 +125,8 @@ private: bool mInboxEnabled; - LLInventoryCategoriesObserver* mCategoriesObserver; - LLInboxOutboxAddedObserver* mInboxOutboxAddedObserver; + LLInventoryCategoriesObserver* mCategoriesObserver; + LLInboxAddedObserver* mInboxAddedObserver; }; #endif //LL_LLSIDEPANELINVENTORY_H |