From 1fe7dd2fd7f0f9b7d15e0090e9e14708edbebde9 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 19 Aug 2010 16:16:10 +0300 Subject: EXT-8697 FIXED Disabled "Cut" context menu item for folders in 'My Landmarks'. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/867/. --HG-- branch : product-engine --- indra/newview/llpanellandmarks.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 650a806c00..b4d19408f1 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1120,7 +1120,8 @@ bool LLLandmarksPanel::canSelectedBeModified(const std::string& command_name) co if ("cut" == command_name) { - can_be_modified = root_folder->canCut(); + // "Cut" disabled for folders. See EXT-8697. + can_be_modified = root_folder->canCut() && listenerp->getInventoryType() != LLInventoryType::IT_CATEGORY; } else if ("rename" == command_name) { -- cgit v1.2.3