diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:32:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:32:04 +0800 |
| commit | b74c8ee3fee8dd640f40250ed09f213afa72cefc (patch) | |
| tree | cdad4aa47d4c669292591154b9c3bc1851629dd6 /indra/newview/llfolderviewmodelinventory.cpp | |
| parent | 0dd799f109760f00103a6c58b437aaf3148adc75 (diff) | |
| parent | ec6c988bbbc59aed218d3629bf0c13192f6b726c (diff) | |
Merge tag 'Second_Life_Release#ec6c988-2025.05' into 2025.05
Diffstat (limited to 'indra/newview/llfolderviewmodelinventory.cpp')
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index 9223c13ec1..a0621bb015 100644 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -69,7 +69,7 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder ) if (!folder->areChildrenInited() || !needsSort(folder->getViewModelItem())) return; LLFolderViewModelItemInventory* sort_modelp = static_cast<LLFolderViewModelItemInventory*>(folder->getViewModelItem()); - if (sort_modelp->getUUID().isNull()) return; + if (!sort_modelp->canSortContent()) return; bool has_favorites = false; for (std::list<LLFolderViewFolder*>::iterator it = folder->getFoldersBegin(), end_it = folder->getFoldersEnd(); |