diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-31 17:36:16 -0700 |
commit | 6a8df364063639f342592aa40c8aa490d3f73403 (patch) | |
tree | be649cd320bf14c48b982135e58acb2353953a63 /indra/newview/llpanellandmarks.h | |
parent | b2381a039de7e0edbd643d198b85ba8e00524b6b (diff) | |
parent | 122308205b2958b27152b9dd5375554ef76dd084 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
-rw-r--r-- | indra/newview/llpanellandmarks.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index f1ce1a18b5..c9217a4b2f 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -112,7 +112,7 @@ private: void initMyInventoryPanel(); void initLibraryInventoryPanel(); void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list); - void initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab); + LLAccordionCtrlTab* initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab); void onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list); void deselectOtherThan(const LLPlacesInventoryPanel* inventory_list); @@ -121,7 +121,6 @@ private: void updateListCommands(); void onActionsButtonClick(); void showActionMenu(LLMenuGL* menu, std::string spawning_view_name); - void onAddButtonHeldDown(); void onTrashButtonClick() const; void onAddAction(const LLSD& command_name) const; void onClipboardAction(const LLSD& command_name) const; @@ -170,6 +169,8 @@ private: typedef std::vector<LLAccordionCtrlTab*> accordion_tabs_t; accordion_tabs_t mAccordionTabs; + + LLAccordionCtrlTab* mMyLandmarksAccordionTab; }; #endif //LL_LLPANELLANDMARKS_H |