diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-25 11:38:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-25 11:38:01 +0300 |
| commit | 3330a4adb8a73cd51a774212c92ebec6c482b665 (patch) | |
| tree | 45693ed8091481d8b3e516f180bdb1a5e3b4835b /indra/newview/lloutfitgallery.cpp | |
| parent | 2fa69bc13e8c629f1e3dd5eafa3dd07c83dbb4ae (diff) | |
| parent | 4b543b618b101aca9dee1f224d8dbd4fbf937d71 (diff) | |
Merge pull request #2105 from RyeMutt/button-image-warning
Fix warning from misnamed button image name reference
Diffstat (limited to 'indra/newview/lloutfitgallery.cpp')
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 96be917019..b1b9f69f4f 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -416,7 +416,8 @@ void LLOutfitGallery::updateRowsIfNeeded() bool compareGalleryItem(LLOutfitGalleryItem* item1, LLOutfitGalleryItem* item2) { - if(gSavedSettings.getBOOL("OutfitGallerySortByName") || + static LLCachedControl<bool> outfit_gallery_sort_by_name(gSavedSettings, "OutfitGallerySortByName"); + if(outfit_gallery_sort_by_name || ((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage()))) { std::string name1 = item1->getItemName(); |