diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-28 09:01:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-28 09:01:20 +0300 |
| commit | f5d22358d29905c2adbe0af1c8c453dd0a80b4e2 (patch) | |
| tree | 69a9463a73d9505196ab7f3e32c6b0266582a026 /indra/newview | |
| parent | c828382db3e5d689194295d6e4351715bca02aca (diff) | |
MAINT-5432 MAINT-5440 FIXED Crash
in LLUUID::operator==(LLUUID const &) and LLFolderView::removeSelectedItems()
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 0195b5efc1..218590e5c3 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2620,7 +2620,8 @@ void LLInventoryAction::buildMarketplaceFolders(LLFolderView* root) for (; set_iter != selected_items.end(); ++set_iter) { viewModel = dynamic_cast<LLFolderViewModelItemInventory *>((*set_iter)->getViewModelItem()); - if (viewModel && gInventory.isObjectDescendentOf(viewModel->getInventoryObject()->getParentUUID(), marketplacelistings_id)) + if (!viewModel || !viewModel->getInventoryObject()) continue; + if (gInventory.isObjectDescendentOf(viewModel->getInventoryObject()->getParentUUID(), marketplacelistings_id)) { const LLUUID &parent_id = viewModel->getInventoryObject()->getParentUUID(); if (parent_id != marketplacelistings_id) |