summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-08-06 22:53:06 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-08-06 22:53:06 +0300
commitb111138d64ef8c1ca93081270a711fcc88809719 (patch)
tree3f9e8459e0d4e2ceafe5af34b037316200b3dbbe /indra/newview
parent1de9a6e32e5060d299d79ab874b892a6a325dd70 (diff)
SL-15778 Crash at getPreferredType() in findCategoryUUIDForTypeInRoot
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorymodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 6aed00be2a..ba453471c6 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -487,7 +487,8 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
S32 count = cats->size();
for(S32 i = 0; i < count; ++i)
{
- if(cats->at(i)->getPreferredType() == preferred_type)
+ LLViewerInventoryCategory* p_cat = cats->at(i);
+ if(p_cat && p_cat->getPreferredType() == preferred_type)
{
const LLUUID& folder_id = cats->at(i)->getUUID();
if (rv.isNull() || folder_id < rv)