summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-10-23 15:59:15 +0300
committerandreykproductengine <akleshchev@productengine.com>2014-10-23 15:59:15 +0300
commitbf3d017b69ba0a862aa448dc97c8783a7d911fde (patch)
tree314c3c4534b8b02b7d2ff3e9da1ced351ea67514
parent5c3d8de4a5294e9bec65678b089a8eebb4105427 (diff)
MAINT-2131 FIXED "Copy" menu item is enabled for folders in "My inventory" panel inside "Places>My Landmarks" tab
-rwxr-xr-xindra/newview/llpanellandmarks.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 75a3584a1e..1d73d4bd6e 100755
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -1173,7 +1173,8 @@ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFold
if ("copy" == command_name)
{
- return root_folder->canCopy();
+ // we shouldn't be able to copy folders from My Inventory Panel
+ return can_be_modified && root_folder->canCopy();
}
else if ("collapse" == command_name)
{