diff options
| author | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-29 16:55:22 -0700 |
| commit | ecc2c726502448076295254714c0bfa8c0074f25 (patch) | |
| tree | 6a9434c540f7b5ea7bca326df1a420e4a0a99cc4 /indra/newview/llpanellandmarks.h | |
| parent | d2f9e34598621f1dabad15025417efd6b81dddf0 (diff) | |
| parent | ac103403160e87bb6b40ac3e032d077a3381da8e (diff) | |
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
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 |