diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 11:17:52 -0800 |
| commit | 7ff2bfd0af6e124d74a7c1c9532fcffff5e0d7fe (patch) | |
| tree | a0ec093a39c82f2bdd25ee0660f27ebb7f929116 /indra/newview/llpanellandmarks.cpp | |
| parent | c8e97d83bd330103a24755692e3d409015be5a66 (diff) | |
| parent | 5b7f40df4e2125cee36fdeed53a10e6ebd624929 (diff) | |
merge changes from product-engine
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 48a93f0d42..c9598a2576 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -184,9 +184,9 @@ void LLLandmarksPanel::updateVerbs() if (!isTabVisible()) return; - BOOL enabled = isLandmarkSelected(); - mTeleportBtn->setEnabled(enabled); - mShowOnMapBtn->setEnabled(enabled); + 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 |