diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-17 13:37:03 -0700 |
| commit | f975cfd7361729195f2bb14d874e5eacc6140759 (patch) | |
| tree | 471389ca5dab742aaf84c678c4dcef3433da8e9a /indra/newview/llinventorymodel.cpp | |
| parent | 2f8f1c7a44f45490db5b5f040914e42aef2f5280 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
Merge remote-tracking branch 'origin/main' 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()) |