3 files changed, 17 insertions, 4 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index fd4c33df30..18500b891f 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1356,9 +1356,17 @@ bool LLFlatListViewEx::getForceShowingUnmatchedItems()
 	return mForceShowingUnmatchedItems;
 }
 
-void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
+void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show, bool notify_parent)
 {
-	mForceShowingUnmatchedItems = show;
+    if (mForceShowingUnmatchedItems != show)
+    {
+        mForceShowingUnmatchedItems = show;
+        if (!mFilterSubString.empty())
+        {
+            updateNoItemsMessage(mFilterSubString);
+            filterItems(false, true);
+        }
+    }
 }
 
 void LLFlatListViewEx::setFilterSubString(const std::string& filter_str, bool notify_parent)
@@ -1427,6 +1435,7 @@ void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 
     if (visibility_changed && notify_parent)
     {
+        rearrangeItems();
         notifyParentItemsRectChanged();
     }
 }
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index adb0e3e553..e42cae8985 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -480,7 +480,11 @@ public:
 
 	bool getForceShowingUnmatchedItems();
 
-	void setForceShowingUnmatchedItems(bool show);
+    /**
+     * Sets filtered out items to stay visible. Can result in rect changes,
+     * so can notify_parent if rect changes
+	 */
+	void setForceShowingUnmatchedItems(bool show, bool notify_parent);
 
 	/**
 	 * Sets up new filter string and filters the list.
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 7be8db4777..7a78540510 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -777,7 +777,7 @@ void LLFolderViewItem::drawFavoriteIcon(const Params& default_params, const LLUI
     {
         favorite_image = default_params.favorite_image;
     }
-    else if (mHasFavorites && !hasVisibleChildren())
+    else if (mHasFavorites && !isOpen())
     {
         favorite_image = default_params.favorite_content_image;
     }