Merge commit '25b19eb6b8' into marchcat/c-develop

# Conflicts:
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index cd36dc1ffb..52c0afbe68 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -628,10 +628,11 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
     {
         if (view_item)
         {
+            view_item->refresh();
             LLFolderViewFolder* parent = view_item->getParentFolder();
             if (parent)
             {
-                parent->updateHasFavorites(view_item->isFavorite());
+                parent->updateHasFavorites(get_is_favorite(model_item));
             }
         }
     }
@@ -664,7 +665,8 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                 setSelection(item_id, false);
             }
             updateFolderLabel(model_item->getParentUUID());
-            if (model_item->getIsFavorite())
+
+            if (get_is_favorite(model_item))
             {
                 LLFolderViewFolder* new_parent = (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
                 if (new_parent)
@@ -2423,6 +2425,7 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con
         LLInventoryObserver::ADD |
         LLInventoryObserver::REMOVE))
     {
+        // specifically exlude links and not get_is_favorite(model_item)
         if (model_item && model_item->getIsFavorite())
         {
             LLFolderViewItem* view_item = getItemByID(id);