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

SL-10013 Crash in LLFolderViewModelItemInventory::filterChildItem(..)

master
maxim_productengine 2018-11-06 17:14:36 +02:00
parent 23356ac003
commit 2f12e96e61
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llfolderviewmodelinventory.cpp
View File

@ -181,24 +181,26 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite
S32 filter_generation = filter.getCurrentGeneration();
bool continue_filtering = true;
if (item->getLastFilterGeneration() < filter_generation)
if (item)
{
// Recursive application of the filter for child items (CHUI-849)
continue_filtering = item->filter( filter );
}
// Update latest generation to pass filter in parent and propagate up to root
if (item->passedFilter())
{
LLFolderViewModelItemInventory* view_model = this;
while(view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
if (item->getLastFilterGeneration() < filter_generation)
{
view_model->mMostFilteredDescendantGeneration = filter_generation;
view_model = static_cast<LLFolderViewModelItemInventory*>(view_model->mParent);
// Recursive application of the filter for child items (CHUI-849)
continue_filtering = item->filter(filter);
}
// Update latest generation to pass filter in parent and propagate up to root
if (item->passedFilter())
{
LLFolderViewModelItemInventory* view_model = this;
while (view_model && view_model->mMostFilteredDescendantGeneration < filter_generation)
{
view_model->mMostFilteredDescendantGeneration = filter_generation;
view_model = static_cast<LLFolderViewModelItemInventory*>(view_model->mParent);
}
}
}
return continue_filtering;
}