diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-02-25 20:25:56 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-02-25 20:25:56 +0200 |
| commit | 806345951bcb72ae709cc19a198f78905fcbdb46 (patch) | |
| tree | a1f2cca7617b76313745ae4a6bc503f28254da71 /indra/newview/llpanellandmarks.cpp | |
| parent | 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7 (diff) | |
Revert "SL-14901 Add a button on the Landmarks bar to open the Places floater"
This reverts commit 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7.
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index d763a6e1ec..ccd8497484 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -65,7 +65,6 @@ static const std::string ADD_BUTTON_NAME = "add_btn"; static const std::string ADD_FOLDER_BUTTON_NAME = "add_folder_btn"; static const std::string TRASH_BUTTON_NAME = "trash_btn"; -static const std::string TAB_FAVORITES = "tab_favorites"; // helper functions static void filter_list(LLPlacesInventoryPanel* inventory_list, const std::string& string); @@ -384,7 +383,7 @@ void LLLandmarksPanel::updateShowFolderState() void LLLandmarksPanel::setItemSelected(const LLUUID& obj_id, BOOL take_keyboard_focus) { - if (selectItemInAccordionTab(mFavoritesInventoryPanel, TAB_FAVORITES, obj_id, take_keyboard_focus)) + if (selectItemInAccordionTab(mFavoritesInventoryPanel, "tab_favorites", obj_id, take_keyboard_focus)) { return; } @@ -507,12 +506,6 @@ void LLLandmarksPanel::updateSortOrder(LLInventoryPanel* panel, bool byDate) } } -void LLLandmarksPanel::resetSelection() -{ - getChild<LLAccordionCtrlTab>(TAB_FAVORITES)->setDisplayChildren(true); - getChild<LLAccordionCtrlTab>(TAB_FAVORITES)->showAndFocusHeader(); -} - // virtual void LLLandmarksPanel::processParcelInfo(const LLParcelData& parcel_data) { @@ -557,7 +550,7 @@ void LLLandmarksPanel::initFavoritesInventoryPanel() initLandmarksPanel(mFavoritesInventoryPanel); mFavoritesInventoryPanel->getFilter().setEmptyLookupMessage("FavoritesNoMatchingItems"); - initAccordion(TAB_FAVORITES, mFavoritesInventoryPanel, true); + initAccordion("tab_favorites", mFavoritesInventoryPanel, true); } void LLLandmarksPanel::initLandmarksInventoryPanel() |