diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-24 15:43:02 +0200 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-03-24 15:43:02 +0200 |
| commit | c0ea363c86a1a2182754b201622bc78bdbea787e (patch) | |
| tree | c7f9674395df296129f842ef8b5ba87bdcb47942 /indra/newview/llpanellandmarks.cpp | |
| parent | c4a1e10a8d29b95f925b64fccefdbeaf292c99dd (diff) | |
Normal bug (EXT-6511) "Rename" item is enabled for multiple landmarks
- Fixed check to enable/disable "Rename" menu item if multiple items are selected.
Reviewed by Leyla Farazha and Mike Antipov
https://codereview.productengine.com/secondlife/r/85/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index be460e8e5c..220ea2813d 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -922,7 +922,6 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const return false; } else if ( "paste" == command_name - || "rename" == command_name || "cut" == command_name || "copy" == command_name || "delete" == command_name @@ -934,16 +933,16 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const } else if ( "teleport" == command_name || "more_info" == command_name - || "rename" == command_name || "show_on_map" == command_name || "copy_slurl" == command_name ) { // disable some commands for multi-selection. EXT-1757 - if (root_folder_view->getSelectedCount() > 1) - { - return false; - } + return root_folder_view->getSelectedCount() == 1; + } + else if ("rename" == command_name) + { + return root_folder_view->getSelectedCount() == 1 && canSelectedBeModified(command_name); } else if("category" == command_name) { |