From c828382db3e5d689194295d6e4351715bca02aca Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 24 Jul 2015 15:48:27 +0300
Subject: [PATCH] MAINT-5432 FIXED Null check to avoid crash
---
indra/newview/llinventoryfunctions.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 0dbb5a6d616..0195b5efc11 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;
--
GitLab