summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfilter.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-29 01:08:39 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-29 01:08:39 +0000
commit10459c79e793c09ea976a24ce1026c42ccf2690d (patch)
treeeb562e983d5e8eeeecbd49645444aaf869f2fbf4 /indra/newview/llinventoryfilter.cpp
parent558897b4b90635f729a6264daecfe14752a12ceb (diff)
EXT-614 Object inventory does not update to show inventory created or placed in the object.
Reviewed by: Seraph
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
-rw-r--r--indra/newview/llinventoryfilter.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index c41900d691..b4d3f4575b 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -111,11 +111,16 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
}
else
{
- passed_type |= ((1LL << listener->getInventoryType() & mFilterOps.mFilterTypes) != U64(0));
- if (listener->getInventoryType() == LLInventoryType::IT_NONE)
+ LLInventoryType::EType type = listener->getInventoryType();
+ passed_type |= ((1LL << type & mFilterOps.mFilterTypes) != U64(0));
+ if (type == LLInventoryType::IT_NONE)
{
const LLInventoryObject *obj = gInventory.getObject(listener->getUUID());
- if (obj && !obj->getIsLinkType())
+ if (obj && obj->getIsLinkType())
+ {
+ passed_type = FALSE;
+ }
+ else
{
passed_type = TRUE;
}