livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18161 Fix viewer complaining about dupplicate FT_MATERIAL folders

meow-7.2.2
Andrey Kleshchev 2022-09-19 16:56:25 +03:00
parent 99fbb2e19c
commit 4f7c86a145
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorymodel.cpp
View File

@ -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.