From 10459c79e793c09ea976a24ce1026c42ccf2690d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sat, 29 Aug 2009 01:08:39 +0000 Subject: EXT-614 Object inventory does not update to show inventory created or placed in the object. Reviewed by: Seraph --- indra/newview/llfloatertools.cpp | 2 +- indra/newview/llinventoryfilter.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index bbcab00ab2..d05c9cb9a7 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -446,7 +446,7 @@ void LLFloaterTools::draw() void LLFloaterTools::dirty() { mDirty = TRUE; - LLFloaterOpenObject* instance = LLFloaterReg::getTypedInstance("openobject"); + LLFloaterOpenObject* instance = LLFloaterReg::findTypedInstance("openobject"); if (instance) instance->dirty(); } 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; } -- cgit v1.2.3