diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-19 16:56:25 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-19 16:56:25 +0300 |
| commit | 4f7c86a145877bdaae3e74900076b6790b7abc0e (patch) | |
| tree | 50e08887dce880eb9b6f2ecd3a33d81e7d8e6329 /indra | |
| parent | 99fbb2e19c7cd3b7d8588800d8cab34e98a4580b (diff) | |
SL-18161 Fix viewer complaining about dupplicate FT_MATERIAL folders
Diffstat (limited to 'indra')
| -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 bd106df2cc..63152d167d 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -4334,7 +4334,11 @@ LLPointer<LLInventoryValidationInfo> LLInventoryModel::validate() const { LL_WARNS("Inventory") << "Fatal inventory corruption: system folder type has excess copies under root, type " << ft << " count " << count_under_root << LL_ENDL; validation_info->mDuplicateRequiredSystemFolders.insert(folder_type); - if (!is_automatic && folder_type != LLFolderType::FT_SETTINGS) + if (!is_automatic + && folder_type != LLFolderType::FT_SETTINGS + // FT_MATERIAL might need to be automatic like the rest of upload folders + && folder_type != LLFolderType::FT_MATERIAL + ) { // It is a fatal problem or can lead to fatal problems for COF, // outfits, trash and other non-automatic folders. |