1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 6a8256d41c..7bd9c0bd94 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -99,6 +99,7 @@ BOOL LLOutfitGallery::postBuild()
     BOOL rv = LLOutfitListBase::postBuild();
     mScrollPanel = getChild<LLScrollContainer>("gallery_scroll_panel");
     mGalleryPanel = getChild<LLPanel>("gallery_panel");
+    mMessageTextBox = getChild<LLTextBox>("no_outfits_txt");
     mOutfitGalleryMenu = new LLOutfitGalleryContextMenu(this);
     return rv;
 }
@@ -168,6 +169,7 @@ void LLOutfitGallery::reArrangeRows(S32 row_diff)
     	applyFilter(*it,sFilterSubString);
     	addToGallery(*it);
     }
+    updateMessageVisibility();
 }
 
 void LLOutfitGallery::updateGalleryWidth()
@@ -558,6 +560,22 @@ bool LLOutfitGallery::canWearSelected()
     return false;
 }
 
+void LLOutfitGallery::updateMessageVisibility()
+{
+    if(mItems.empty())
+    {
+        mMessageTextBox->setVisible(TRUE);
+        mScrollPanel->setVisible(FALSE);
+        std::string message = sFilterSubString.empty()? getString("no_outfits_msg") : getString("no_matched_outfits_msg");
+        mMessageTextBox->setValue(message);
+    }
+    else
+    {
+        mScrollPanel->setVisible(TRUE);
+        mMessageTextBox->setVisible(FALSE);
+    }
+}
+
 LLOutfitListGearMenuBase* LLOutfitGallery::createGearMenu()
 {
     return new LLOutfitGalleryGearMenu(this);