summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2009-11-02 16:18:11 +0200
committerMike Antipov <mantipov@productengine.com>2009-11-02 16:18:11 +0200
commit2b259964d59937526e648a1b00c0324628369479 (patch)
tree24eee6b6692e62a8f3c5ac985a672fdfb3b0393a
parent788b08f525ebfcc52ae1cf351d796594cf71f5c1 (diff)
Fixed normal bug EXT-2001 ( [BSI] Can select multiple Landmarks in Places side panel and still click "Map" or "Teleport")
- disable "Map" & "Teleport" buttons for selected folders --HG-- branch : product-engine
-rw-r--r--indra/newview/llpanellandmarks.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 6bff01ee5e..c9598a2576 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -184,8 +184,9 @@ void LLLandmarksPanel::updateVerbs()
if (!isTabVisible())
return;
- mTeleportBtn->setEnabled(isActionEnabled("teleport"));
- mShowOnMapBtn->setEnabled(isActionEnabled("show_on_map"));
+ bool landmark_selected = isLandmarkSelected();
+ mTeleportBtn->setEnabled(landmark_selected && isActionEnabled("teleport"));
+ 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