Merge branch 'develop' of https://github.com/secondlife/viewer
commit
154ed29e6f
|
|
@ -1227,8 +1227,11 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
|
|||
|
||||
LLUUID linked_id = item->getLinkedUUID();
|
||||
LLViewerInventoryItem* linked_item = gInventory.getItem(linked_id);
|
||||
can_favorite |= !linked_item->getIsFavorite();
|
||||
can_unfavorite |= linked_item->getIsFavorite();
|
||||
if (linked_item)
|
||||
{
|
||||
can_favorite |= !linked_item->getIsFavorite();
|
||||
can_unfavorite |= linked_item->getIsFavorite();
|
||||
}
|
||||
|
||||
if (is_worn)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue