diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-18 14:14:38 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-18 14:14:38 +0200 |
| commit | 6ab212c96b30c272acdc1d772d2c597fb58c8910 (patch) | |
| tree | 49a6def0b047d0088374b4d08d99b9286a0c858d | |
| parent | b7c58427bf228aaaef5938bc99a8d9f679bd15ce (diff) | |
SL-16984 Dupplicated FT_SETTINGS shouldn't prevent inventory from loading
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 8ddba510b4..37500176ea 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -4302,17 +4302,17 @@ 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) + if (!is_automatic && folder_type != LLFolderType::FT_SETTINGS) { // It is a fatal problem or can lead to fatal problems for COF, - // outfits and trash and other non-automatic folders. - // Exception: FT_SETTINGS likely only deserves a warning. + // outfits, trash and other non-automatic folders. fatal_errs++; } else { // For automatic folders it's not a fatal issue and shouldn't // break inventory or other functionality further + // Exception: FT_SETTINGS is not automatic, but only deserves a warning. warnings++; } } |