diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
| commit | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (patch) | |
| tree | 4da36d5bae02191ce86dea8b5b074b48f516a3ae /indra/newview/llinventoryfilter.cpp | |
| parent | d53725ece11eb3403128dd77834742a1d084138f (diff) | |
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 596211f16c..f5525ec1f2 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -111,7 +111,15 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item) } else { - passed_type |= ((1LL << listener->getInventoryType() & mFilterOps.mFilterTypes) != U64(0)) || listener->getInventoryType() == LLInventoryType::IT_NONE; + passed_type |= ((1LL << listener->getInventoryType() & mFilterOps.mFilterTypes) != U64(0)); + if (listener->getInventoryType() == LLInventoryType::IT_NONE) + { + const LLInventoryObject *obj = gInventory.getObject(listener->getUUID()); + if (!obj->getIsLinkType()) + { + passed_type = TRUE; + } + } } BOOL passed = passed_type |