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

CHUI-206 FIX Viewer crash when selecting to cut inventory item, then selecting to cut another inventory item 

Seems to work now, without filtering de-optimization
meow-7.2.2
Richard Linden 2012-07-24 20:29:20 -07:00
parent 1736c7b74e
commit 891a09561d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfolderview.cpp
View File

@ -1123,7 +1123,7 @@ void LLFolderView::paste()
LLFolderViewFolder* folder = dynamic_cast<LLFolderViewFolder*>(item);
if (folder == NULL)
{
item = item->getParentFolder();
folder = item->getParentFolder();
}
folder_set.insert(folder);
}

5
indra/newview/llfolderviewmodelinventory.cpp
View File

@ -163,11 +163,6 @@ bool LLFolderViewModelItemInventory::filterChildItem( LLFolderViewModelItem* ite
{
// failed to pass an earlier filter that was a subset of the current one
// go ahead and flag this item as done
item->filter(filter);
if (item->passedFilter())
{
llerrs << "Invalid shortcut in inventory filtering!" << llendl;
}
item->setPassedFilter(false, false, filter_generation);
}
else