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

Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
master
Ansariel 2025-06-01 02:12:33 +02:00
parent e0ffe6c160 2d0f9e4737
commit ab1b8c1cbf
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/lloutfitgallery.cpp
View File

@ -832,7 +832,6 @@ void LLOutfitGallery::updateAddedCategory(LLUUID cat_id)
return;
}
std::string name = cat->getName();
LLOutfitGalleryItem* item = buildGalleryItem(cat->getName(), cat_id, cat->getIsFavorite());
mOutfitMap.insert(LLOutfitGallery::outfit_map_value_t(cat_id, item));
item->setRightMouseDownCallback(boost::bind(&LLOutfitListBase::outfitRightClickCallBack, this,