From e10173894f2e150adb3aa0147241ea2c4690a6dd Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 21 Apr 2010 13:32:51 +0300 Subject: Fixed EXT-6906(normal) - Buttons overlapping on Place profile panel Problem: "Profile" button is visible when viewing current agent place info and remote parcel info. Solution: Hide "Profile" button when we are viewing place profile. Updated "Profile" button visibility condition. New condition hides the button when viewing landmark info, teleport history info, agent place info and remote parcel info. Bug introduced in changeset 11252 : c5b3adc89f28 (EXT-6605 (No profile verb button on Places panel)) Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/274/ --HG-- branch : product-engine --- indra/newview/llpanelplaces.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 17784c31e3..89293d0e50 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1071,8 +1071,7 @@ void LLPanelPlaces::updateVerbs() mSaveBtn->setVisible(isLandmarkEditModeOn); mCancelBtn->setVisible(isLandmarkEditModeOn); mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn); - mPlaceInfoBtn->setVisible(mPlaceInfoType != LANDMARK_INFO_TYPE && mPlaceInfoType != TELEPORT_HISTORY_INFO_TYPE - && !is_create_landmark_visible && !isLandmarkEditModeOn); + mPlaceInfoBtn->setVisible(!is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn); mShowOnMapBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos); mPlaceInfoBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos); -- cgit v1.2.3