1 files changed, 22 insertions, 5 deletions

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 53f39766c6..34eb1ea3fc 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -69,7 +69,7 @@ const LLRect& LLFlatListView::getItemsRect() const
 bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null*/, EAddPosition pos /*= ADD_BOTTOM*/,bool rearrange /*= true*/)
 {
     if (!item) return false;
-    if (value.isUndefined()) return false;
+    if (value.isUndefined()) return false; // item stays an orphan?!!!
 
     //force uniqueness of items, easiest check but unreliable
     if (item->getParent() == mItemsPanel) return false;
@@ -459,6 +459,7 @@ LLFlatListView::LLFlatListView(const LLFlatListView::Params& p)
   , mNoItemsCommentTextbox(NULL)
   , mIsConsecutiveSelection(false)
   , mKeepSelectionVisibleOnReshape(p.keep_selection_visible_on_reshape)
+  , mFocusOnItemClicked(true)
 {
     mBorderThickness = getBorderWidth();
 
@@ -536,6 +537,7 @@ bool LLFlatListView::postBuild()
 
 void LLFlatListView::rearrangeItems()
 {
+    LL_PROFILE_ZONE_SCOPED;
     static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
 
     setNoItemsCommentVisible(0==size());
@@ -610,7 +612,10 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
         return;
     }
 
-    setFocus(true);
+    if (mFocusOnItemClicked)
+    {
+        setFocus(true);
+    }
 
     bool select_item = !isSelected(item_pair);
 
@@ -1128,6 +1133,7 @@ bool LLFlatListView::removeItemPair(item_pair_t* item_pair, bool rearrange)
 
 void LLFlatListView::notifyParentItemsRectChanged()
 {
+    LL_PROFILE_ZONE_SCOPED;
     S32 comment_height = 0;
 
     // take into account comment text height if exists
@@ -1337,14 +1343,22 @@ void LLFlatListViewEx::updateNoItemsMessage(const std::string& filter_string)
     }
 }
 
-bool LLFlatListViewEx::getForceShowingUnmatchedItems()
+bool LLFlatListViewEx::getForceShowingUnmatchedItems() const
 {
     return mForceShowingUnmatchedItems;
 }
 
-void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show)
+void LLFlatListViewEx::setForceShowingUnmatchedItems(bool show, bool notify_parent)
+{
+    if (mForceShowingUnmatchedItems != show)
 {
     mForceShowingUnmatchedItems = show;
+        if (!mFilterSubString.empty())
+        {
+            updateNoItemsMessage(mFilterSubString);
+            filterItems(false, true);
+        }
+    }
 }
 
 void LLFlatListViewEx::setFilterSubString(const std::string& filter_str, bool notify_parent)
@@ -1389,7 +1403,7 @@ bool LLFlatListViewEx::updateItemVisibility(LLPanel* item, const LLSD &action)
     return false;
 }
 
-void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
+bool LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 {
     std::string cur_filter = mFilterSubString;
     LLStringUtil::toUpper(cur_filter);
@@ -1412,8 +1426,11 @@ void LLFlatListViewEx::filterItems(bool re_sort, bool notify_parent)
 
     if (visibility_changed && notify_parent)
     {
+        rearrangeItems();
         notifyParentItemsRectChanged();
+        return true;
     }
+    return false;
 }
 
 bool LLFlatListViewEx::hasMatchedItems()