diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
| commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
| tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/newview/llpanellandmarks.cpp | |
| parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
merge up to latest viewer-release
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index c7454e85a9..68a3b6d1cd 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1149,7 +1149,7 @@ Rules: - cut/rename/delete in any other accordions - paste - only in Favorites, Landmarks accordions 3. For Folders we can: perform any action in Landmarks accordion, except Received folder - 4. We can not paste folders from Clipboard (processed by LLFolderView::canPaste()) + 4. We can paste folders from Clipboard (processed by LLFolderView::canPaste()) 5. Check LLFolderView/Inventory Bridges rules */ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFolderViewItem* item) const @@ -1206,8 +1206,7 @@ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFold if ("cut" == command_name) { - // "Cut" disabled for folders. See EXT-8697. - can_be_modified = root_folder->canCut() && listenerp->getInventoryType() != LLInventoryType::IT_CATEGORY; + can_be_modified = root_folder->canCut(); } else if ("rename" == command_name) { |