1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index cb54645ce5..52d03e302e 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -624,12 +624,15 @@ bool LLInventoryFilter::checkAgainstFilterFavorites(const LLUUID& object_id) con
     const LLInventoryObject* object = gInventory.getObject(object_id);
     if (!object) return true;
 
-    const bool is_favorite = object->getIsFavorite();
 
-    if (is_favorite && (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES))
-        return false;
-    if (!is_favorite && (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES))
-        return false;
+    if (mFilterOps.mFilterFavorites != FILTER_INCLUDE_FAVORITES)
+    {
+        bool is_favorite = get_is_favorite(object);
+        if (is_favorite && (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES))
+            return false;
+        if (!is_favorite && (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES))
+            return false;
+    }
 
     return true;
 }