diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
| commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
| tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/newview/llinventorymodel.cpp | |
| parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
| parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 7ccb8b807d..3bffd96038 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -592,7 +592,11 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot( } } - if(rv.isNull() && create_folder && root_id.notNull()) + if(rv.isNull() + && root_id.notNull() + && create_folder + && preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS + && preferred_type != LLFolderType::FT_OUTBOX) { if (isInventoryUsable()) |