summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellandmarks.cpp
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-03-23 21:36:27 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2010-03-23 21:36:27 +0200
commitf99fae683736961ceda866c7778ad96ab559f496 (patch)
tree6431d9ec9c4a96cb2b93e505f47105a19f20e600 /indra/newview/llpanellandmarks.cpp
parentae9e68f251033f8ed0b40163f778d8f4460634d3 (diff)
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
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
-rw-r--r--indra/newview/llpanellandmarks.cpp2
1 files changed, 1 insertions, 1 deletions
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)
{