From bf3d017b69ba0a862aa448dc97c8783a7d911fde Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 23 Oct 2014 15:59:15 +0300 Subject: MAINT-2131 FIXED "Copy" menu item is enabled for folders in "My inventory" panel inside "Places>My Landmarks" tab --- indra/newview/llpanellandmarks.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') 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) { -- cgit v1.2.3