diff options
author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-07-24 15:48:27 +0300 |
---|---|---|
committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-07-24 15:48:27 +0300 |
commit | c828382db3e5d689194295d6e4351715bca02aca (patch) | |
tree | c7501db51ea8f8a13d2c5b2416c11d8b233d5865 /indra/newview | |
parent | 4ac031a899383cd61f318e86d09816078b75c2fe (diff) |
MAINT-5432 FIXED Null check to avoid crash
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 0dbb5a6d61..0195b5efc1 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -2609,6 +2609,11 @@ void LLInventoryAction::buildMarketplaceFolders(LLFolderView* root) // Note: do not however put the marketplace listings root itself in this list or the whole marketplace data will be rebuilt. sMarketplaceFolders.clear(); const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false); + if (marketplacelistings_id.isNull()) + { + return; + } + std::set<LLFolderViewItem*> selected_items = root->getSelectionList(); std::set<LLFolderViewItem*>::iterator set_iter = selected_items.begin(); LLFolderViewModelItemInventory * viewModel = NULL; |