From f99fae683736961ceda866c7778ad96ab559f496 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Tue, 23 Mar 2010 21:36:27 +0200 Subject: Fixed normal bug (EXT-5690) "delete" button is enabled for landmarks from trash - Added check for landmarks already in trash to disable "delete" button for them. --HG-- branch : product-engine --- indra/newview/llpanellandmarks.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 879fbba9cd..be460e8e5c 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1072,7 +1072,7 @@ bool LLLandmarksPanel::canSelectedBeModified(const std::string& command_name) co } else if ("delete" == command_name) { - can_be_modified = listenerp ? listenerp->isItemRemovable() : false; + can_be_modified = listenerp ? listenerp->isItemRemovable() && !listenerp->isItemInTrash() : false; } else if("paste" == command_name) { -- cgit v1.2.3