Commit 068258fb authored by NiranV's avatar NiranV

Fixed: Edit button in Places not working, not hiding and being shown in the wrong panel.

parent 0d8ecf16
......@@ -277,6 +277,9 @@ BOOL LLPanelPlaces::postBuild()
{
mTeleportBtn = getChild<LLButton>("teleport_btn");
mTeleportBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onTeleportButtonClicked, this));
mEditBtn = getChild<LLButton>("edit_btn");
mEditBtn->setCommitCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
mShowOnMapBtn = getChild<LLButton>("map_btn");
mShowOnMapBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onShowOnMapButtonClicked, this));
......@@ -350,9 +353,6 @@ BOOL LLPanelPlaces::postBuild()
LLComboBox* folder_combo = mLandmarkInfo->getChild<LLComboBox>("folder_combo");
folder_combo->setCommitCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
LLButton* edit_btn = mLandmarkInfo->getChild<LLButton>("edit_btn");
edit_btn->setCommitCallback(boost::bind(&LLPanelPlaces::onEditButtonClicked, this));
createTabs();
updateVerbs();
......@@ -1207,7 +1207,7 @@ void LLPanelPlaces::updateVerbs()
mTeleportBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn && !is_pick_panel_visible && is_place_info_visible);
mShowOnMapBtn->setVisible(!is_create_landmark_visible && !isLandmarkEditModeOn && !is_pick_panel_visible && is_place_info_visible);
mOverflowBtn->setVisible(is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn && is_place_info_visible);
//mEditBtn->setVisible(mPlaceInfoType == LANDMARK_INFO_TYPE && !isLandmarkEditModeOn && is_place_info_visible);
mEditBtn->setVisible(mPlaceInfoType == LANDMARK_INFO_TYPE && !isLandmarkEditModeOn && is_place_info_visible);
mSaveBtn->setVisible(isLandmarkEditModeOn && is_place_info_visible);
mCancelBtn->setVisible(isLandmarkEditModeOn && is_place_info_visible);
mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn && is_place_info_visible);
......
......@@ -118,6 +118,7 @@ class LLPanelPlaces : public LLPanel
LLToggleableMenu* mLandmarkMenu;
LLButton* mPlaceProfileBackBtn;
LLButton* mEditBtn;
LLButton* mTeleportBtn;
LLButton* mShowOnMapBtn;
LLButton* mSaveBtn;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment