Merge commit '7ae63daff1' into marchcat/c-develop

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp

4 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index 9e936eee5b..63d3117e77 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -115,7 +115,7 @@ void LLInventoryItemsList::doIdle()
 {
     if (mRefreshState == REFRESH_COMPLETE) return;
 
-    if (isInVisibleChain() || mForceRefresh )
+    if (isInVisibleChain() || mForceRefresh || !getFilterSubString().empty())
     {
         refresh();
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index ee7a26ddd2..ccb5a59bf8 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -78,7 +78,7 @@
 
 // Increment this if the inventory contents change in a non-backwards-compatible way.
 // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect.
-const S32 LLInventoryModel::sCurrentInvCacheVersion = 3;
+const S32 LLInventoryModel::sCurrentInvCacheVersion = 4;
 bool LLInventoryModel::sFirstTimeInViewer2 = true;
 
 S32 LLInventoryModel::sPendingSystemFolders = 0;
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 72f361c4d9..adf9cd3518 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -421,7 +421,7 @@ void LLOutfitGallery::updateRowsIfNeeded()
 
 bool compareGalleryItem(LLOutfitGalleryItem* item1, LLOutfitGalleryItem* item2)
 {
-    LLCachedControl<S32> sort_by_name(gSavedSettings, "OutfitGallerySortOrder", 0);
+    static LLCachedControl<S32> sort_by_name(gSavedSettings, "OutfitGallerySortOrder", 0);
     switch (sort_by_name())
     {
     case 2:
@@ -1069,7 +1069,7 @@ void LLOutfitGalleryItem::setOutfitFavorite(bool is_favorite)
 {
     mFavorite = is_favorite;
 
-    LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
+    static LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
     mOutfitNameText->setReadOnlyColor((mFavorite && use_color()) ? sDefaultFavoriteColor.get() : sDefaultTextColor.get());
 }
 
@@ -1084,7 +1084,7 @@ void LLOutfitGalleryItem::setOutfitWorn(bool value)
     mOutfitWornText->setValue(value ? worn_string : "");
     mOutfitNameText->setText(mOutfitName); // refresh LLTextViewModel to pick up font changes
 
-    LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
+    static LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
     mOutfitNameText->setReadOnlyColor((mFavorite && use_color()) ? sDefaultFavoriteColor.get() : sDefaultTextColor.get());
 }
 
@@ -1460,7 +1460,7 @@ void LLOutfitGallerySortMenu::onUpdateItemsVisibility()
 
 bool LLOutfitGallerySortMenu::onEnable(LLSD::String param)
 {
-    LLCachedControl<S32> sort_order(gSavedSettings, "OutfitGallerySortOrder", 0);
+    static LLCachedControl<S32> sort_order(gSavedSettings, "OutfitGallerySortOrder", 0);
     if ("favorites_to_top" == param)
     {
         return sort_order == 2;
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index e46f852062..13bd270f7b 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -225,7 +225,7 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     tab->setDropDownStateChangedCallback(boost::bind(&LLOutfitsList::resetItemSelection, this, list, cat_id));
 
     // Depending on settings, force showing list items that don't match current filter(EXT-7158)
-    LLCachedControl<bool> list_filter(gSavedSettings, "OutfitListFilterFullList");
+    static LLCachedControl<bool> list_filter(gSavedSettings, "OutfitListFilterFullList");
     list->setForceShowingUnmatchedItems(list_filter(), false);
 
     // Setting list commit callback to monitor currently selected wearable item.
@@ -567,7 +567,7 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons
         LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
         if (list)
         {
-            list->setFilterSubString(new_string, tab->getDisplayChildren());
+            list->setFilterSubString(new_string, true);
         }
 
         if (old_string.empty())
@@ -1570,12 +1570,12 @@ bool LLOutfitListSortMenu::onEnable(LLSD::String param)
 {
     if ("favorites_to_top" == param)
     {
-        LLCachedControl<S32> sort_order(gSavedSettings, "OutfitListSortOrder", 0);
+        static LLCachedControl<S32> sort_order(gSavedSettings, "OutfitListSortOrder", 0);
         return sort_order == 1;
     }
     else if ("show_entire_outfit" == param)
     {
-        LLCachedControl<bool> filter_mode(gSavedSettings, "OutfitListFilterFullList", 0);
+        static LLCachedControl<bool> filter_mode(gSavedSettings, "OutfitListFilterFullList", 0);
         return filter_mode;
     }