livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-614 Object inventory does not update to show inventory created or placed in the object. 

Reviewed by: Seraph
meow-7.2.2
Steven Bennetts 2009-08-29 01:08:39 +00:00
parent 558897b4b9
commit 10459c79e7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatertools.cpp
View File

@ -446,7 +446,7 @@ void LLFloaterTools::draw()
void LLFloaterTools::dirty()
{
mDirty = TRUE;
LLFloaterOpenObject* instance = LLFloaterReg::getTypedInstance<LLFloaterOpenObject>("openobject");
LLFloaterOpenObject* instance = LLFloaterReg::findTypedInstance<LLFloaterOpenObject>("openobject");
if (instance) instance->dirty();
}

11
indra/newview/llinventoryfilter.cpp
View File

@ -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;
}