1 files changed, 69 insertions, 48 deletions

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 3e19bf885d..930e9e48ea 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2353,58 +2353,40 @@ public:
     /* virtual */ void fire(const LLUUID& inv_item_id) override
     {
         gInventory.addChangedMask(LLInventoryObserver::UPDATE_FAVORITE, mInvItemID);
-        gInventory.notifyObservers();
-    }
-private:
-    LLUUID mInvItemID;
-};
 
-void set_favorite(const LLUUID& obj_id, bool favorite)
-{
-    LLInventoryObject* obj = gInventory.getObject(obj_id);
-    if (obj->getIsFavorite() != favorite)
-    {
-        LLSD val;
-        if (favorite)
-        {
-            val = true;
-        } // else leave undefined to remove unneeded metadata field
+        LLInventoryModel::item_array_t items;
+        LLInventoryModel::cat_array_t cat_array;
+        LLLinkedItemIDMatches matches(mInvItemID);
+        gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
+            cat_array,
+            items,
+            LLInventoryModel::INCLUDE_TRASH,
+            matches);
 
-        LLSD updates;
-        if (favorite)
+        std::set<LLUUID> link_ids;
+        for (LLInventoryModel::item_array_t::iterator it = items.begin(); it != items.end(); ++it)
         {
-            updates["favorite"] = LLSD().with("toggled", true);
-        }
-        else
-        {
-            updates["favorite"] = LLSD();
-        }
+            LLPointer<LLViewerInventoryItem> item = *it;
 
-        LLPointer<LLInventoryCallback> cb = new LLUpdateFavorite(obj_id);
-
-        LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
-        if (view_folder)
-        {
-            update_inventory_category(obj_id, updates, cb);
-        }
-        LLViewerInventoryItem* view_item = dynamic_cast<LLViewerInventoryItem*>(obj);
-        if (view_item)
-        {
-            update_inventory_item(obj_id, updates, cb);
+            gInventory.addChangedMask(LLInventoryObserver::UPDATE_FAVORITE, item->getUUID());
         }
+
+        gInventory.notifyObservers();
     }
-}
+private:
+    LLUUID mInvItemID;
+};
 
-void toggle_favorite(const LLUUID& obj_id)
+void favorite_send(LLInventoryObject* obj, const LLUUID& obj_id, bool favorite)
 {
-    LLInventoryObject* obj = gInventory.getObject(obj_id);
-    if (!obj)
+    LLSD val;
+    if (favorite)
     {
-        return;
-    }
+        val = true;
+    } // else leave undefined to remove unneeded metadata field
 
     LLSD updates;
-    if (!obj->getIsFavorite())
+    if (favorite)
     {
         updates["favorite"] = LLSD().with("toggled", true);
     }
@@ -2427,17 +2409,56 @@ void toggle_favorite(const LLUUID& obj_id)
     }
 }
 
-void toggle_linked_favorite(const LLUUID& obj_id)
+bool get_is_favorite(const LLInventoryObject* object)
 {
-    LLViewerInventoryItem* item = gInventory.getItem(obj_id);
-    if (!item)
+    if (object->getIsLinkType())
     {
-        LL_WARNS() << "Invalid item" << LL_ENDL;
-        return;
+        LLInventoryObject* obj = gInventory.getObject(object->getLinkedUUID());
+        return obj && obj->getIsFavorite();
+    }
+
+    return object->getIsFavorite();
+}
+
+bool get_is_favorite(const LLUUID& obj_id)
+{
+    LLInventoryObject* object = gInventory.getObject(obj_id);
+    if (object && object->getIsLinkType())
+    {
+        LLInventoryObject* obj = gInventory.getObject(object->getLinkedUUID());
+        return obj && obj->getIsFavorite();
+    }
+
+    return object->getIsFavorite();
+}
+
+void set_favorite(const LLUUID& obj_id, bool favorite)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+
+    if (obj && obj->getIsLinkType())
+    {
+        obj = gInventory.getObject(obj_id);
+    }
+
+    if (obj && obj->getIsFavorite() != favorite)
+    {
+        favorite_send(obj, obj_id, favorite);
+    }
+}
+
+void toggle_favorite(const LLUUID& obj_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+    if (obj && obj->getIsLinkType())
+    {
+        obj = gInventory.getObject(obj_id);
     }
 
-    LLUUID linked_id = item->getLinkedUUID();
-    toggle_favorite(linked_id);
+    if (obj)
+    {
+        favorite_send(obj, obj_id, !obj->getIsFavorite());
+    }
 }
 
 std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id)