diff options
| author | Richard Linden <none@none> | 2012-07-24 20:29:20 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-24 20:29:20 -0700 |
| commit | 891a09561d4dff23836c8618d481a6cd2dd001de (patch) | |
| tree | 05990baa16b210bf31dd23d2c55d14c20672cc42 /indra | |
| parent | 1736c7b74e5291b1fee91ae72ff52391ae7d946f (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 8ade17b763..943e690948 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -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); } diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index d23b4af8cb..faf5b3e7ac 100644 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -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 |