summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorVladimir Pchelko <pchelko@productengine.com>2010-06-10 13:16:54 +0300
committerVladimir Pchelko <pchelko@productengine.com>2010-06-10 13:16:54 +0300
commita61c8d2272ee709595655024d57a41bfa1ed5354 (patch)
tree90e3704da815c84095d544db5dc5bca4909007ed /indra
parent92807a6fe27144fd3769fd91856798908e076e91 (diff)
EXT-7608 FIXED TeleportHistory and Landmarks panels now sets "enable" for "Map" bottom according to Design Spec.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/546/ --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanellandmarks.cpp2
-rw-r--r--indra/newview/llpanelteleporthistory.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 7fb46fc84f..ce1131f45c 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -334,7 +334,7 @@ void LLLandmarksPanel::updateVerbs()
bool landmark_selected = isLandmarkSelected();
mTeleportBtn->setEnabled(landmark_selected && isActionEnabled("teleport"));
mShowProfile->setEnabled(landmark_selected && isActionEnabled("more_info"));
- mShowOnMapBtn->setEnabled(true);
+ mShowOnMapBtn->setEnabled(landmark_selected && isActionEnabled("show_on_map"));
// TODO: mantipov: Uncomment when mShareBtn is supported
// Share button should be enabled when neither a folder nor a landmark is selected
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index e8b6c6bfe5..494cba8c6f 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -564,6 +564,7 @@ void LLTeleportHistoryPanel::updateVerbs()
{
mTeleportBtn->setEnabled(false);
mShowProfile->setEnabled(false);
+ mShowOnMapBtn->setEnabled(false);
return;
}
@@ -571,7 +572,7 @@ void LLTeleportHistoryPanel::updateVerbs()
mTeleportBtn->setEnabled(NULL != itemp);
mShowProfile->setEnabled(NULL != itemp);
- mShowOnMapBtn->setEnabled(true);
+ mShowOnMapBtn->setEnabled(NULL != itemp);
}
void LLTeleportHistoryPanel::getNextTab(const LLDate& item_date, S32& tab_idx, LLDate& tab_date)