diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
| commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
| tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/newview/llinventoryfilter.cpp | |
| parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
| parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rwxr-xr-x | indra/newview/llinventoryfilter.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 41567c5237..6a800cf5ba 100755 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -164,7 +164,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 |