summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-09-30 14:46:05 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-09-30 14:46:05 +0300
commitbc244a723d5821812a73a1278bc7bebbba2128ad (patch)
treede330b625359b98600045b1e5d85add08afa775e /indra
parent01a70022280c12173f12352b145670e06efb3d71 (diff)
MAINT-3150 FIXED Show folder links that were always hidden by inventory filter.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llinventoryfilter.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 3c6974cf6d..15463e0d33 100755
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -139,7 +139,14 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
{
return passed_clipboard;
}
-
+
+ // show folder links
+ LLViewerInventoryItem* item = gInventory.getItem(folder_id);
+ if (item && item->getActualType() == LLAssetType::AT_LINK_FOLDER)
+ {
+ return passed_clipboard;
+ }
+
if (mFilterOps.mFilterTypes & FILTERTYPE_CATEGORY)
{
// Can only filter categories for items in your inventory