diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-14 17:04:47 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-14 17:04:47 -0500 |
| commit | afb7efbfcc39f93bb018de6e0b4e5f0839a68ef5 (patch) | |
| tree | 476dd03a9af8a753ef9f89803e340d18cbc2a883 /indra/newview/llinventorymodel.cpp | |
| parent | a0a87db3d76bc78e245e89254db190ba68b3709e (diff) | |
| parent | 5d918f98eaacc0eec84edcf23a40d6f6c93807c3 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index c101033a5d..cc1bd846e5 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -628,6 +628,11 @@ const LLUUID LLInventoryModel::findUserDefinedCategoryUUIDForType(LLFolderType:: cat_id = LLUUID(gSavedPerAccountSettings.getString("AnimationUploadFolder")); break; } + case LLFolderType::FT_MATERIAL: + { + cat_id = LLUUID(gSavedPerAccountSettings.getString("PBRUploadFolder")); + break; + } default: break; } |