diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
| commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
| tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/newview/llinventorymodel.cpp | |
| parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
| parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) | |
DRTVWR-489: trivial merge conflict fix
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 0bbf201dc6..b4727de77f 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -594,7 +594,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()) |