diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:07:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:07:05 +0300 |
| commit | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (patch) | |
| tree | da613ed4e420551235416b8f68e0ed87204469a3 /indra/newview/llinventorygallery.cpp | |
| parent | dcb5cf5bc21ba2e316cc2889b2c1371860b0348d (diff) | |
| parent | 25b19eb6b8b8482d5f6cff0cae8665a0f7518eb1 (diff) | |
Merge commit '25b19eb6b8' into marchcat/c-develop
# Conflicts:
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
Diffstat (limited to 'indra/newview/llinventorygallery.cpp')
| -rw-r--r-- | indra/newview/llinventorygallery.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp index 45c5246aa5..aa6416d17d 100644 --- a/indra/newview/llinventorygallery.cpp +++ b/indra/newview/llinventorygallery.cpp @@ -938,6 +938,7 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id) } bool res = false; + bool is_favorite = get_is_favorite(obj); LLInventoryGalleryItem* item = buildGalleryItem( name, @@ -949,7 +950,7 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id) obj->getCreationDate(), obj->getIsLinkType(), is_worn, - obj->getIsFavorite()); + is_favorite); mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item)); if (mGalleryCreated) { @@ -2369,7 +2370,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id) return; } - updateChangedItemData(*items_iter, obj->getName(), obj->getIsFavorite()); + updateChangedItemData(*items_iter, obj->getName(), get_is_favorite(obj)); mNeedsArrange = true; } |