Merge commit '738cf84c34' into marchcat/c-develop

# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llfolderviewitem.h
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llconversationmodel.h
#	indra/newview/llfloaterinventorysettings.cpp
#	indra/newview/llfolderviewmodelinventory.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorygallery.h
#	indra/newview/llinventorygallerymenu.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 24 insertions, 4 deletions

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 03bafa48bd..45c5246aa5 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -634,7 +634,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn, bool is_favorite)
 {
     LLInventoryGalleryItem::Params giparams;
     giparams.visible = true;
@@ -645,6 +645,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setUUID(item_id);
     gitem->setGallery(this);
     gitem->setType(type, inventory_type, flags, is_link);
+    gitem->setFavorite(is_favorite);
     gitem->setLoadImmediately(mLoadThumbnailsImmediately);
     gitem->setThumbnail(thumbnail_id);
     gitem->setWorn(is_worn);
@@ -938,7 +939,17 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
 
     bool res = false;
 
-    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getCreationDate(), obj->getIsLinkType(), is_worn);
+    LLInventoryGalleryItem* item = buildGalleryItem(
+        name,
+        item_id,
+        obj->getType(),
+        thumbnail_id,
+        inventory_type,
+        misc_flags,
+        obj->getCreationDate(),
+        obj->getIsLinkType(),
+        is_worn,
+        obj->getIsFavorite());
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     if (mGalleryCreated)
     {
@@ -975,7 +986,7 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
     mItemBuildQuery.erase(item_id);
 }
 
-void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
+void LLInventoryGallery::updateChangedItemData(LLUUID item_id, std::string name, bool is_favorite)
 {
     gallery_item_map_t::iterator iter = mItemMap.find(item_id);
     if (iter != mItemMap.end())
@@ -984,6 +995,7 @@ void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
         if (item)
         {
             item->setItemName(name);
+            item->setFavorite(is_favorite);
         }
     }
 }
@@ -2357,7 +2369,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
             return;
         }
 
-        updateChangedItemName(*items_iter, obj->getName());
+        updateChangedItemData(*items_iter, obj->getName(), obj->getIsFavorite());
         mNeedsArrange = true;
     }
 
@@ -2873,6 +2885,14 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::E
     getChild<LLIconCtrl>("link_overlay")->setVisible(is_link);
 }
 
+void LLInventoryGalleryItem::setFavorite(bool is_favorite)
+{
+    getChild<LLIconCtrl>("fav_icon")->setVisible(is_favorite);
+    static const LLUIColor text_color = LLUIColorTable::instance().getColor("LabelTextColor", LLColor4::white);
+    static const LLUIColor favorite_color = LLUIColorTable::instance().getColor("InventoryFavoriteColor", LLColor4::white);
+    mNameText->setReadOnlyColor(is_favorite ? favorite_color : text_color);
+}
+
 void LLInventoryGalleryItem::setThumbnail(LLUUID id)
 {
     mDefaultImage = id.isNull();