summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt5
-rw-r--r--indra/newview/llpanelmaininventory.cpp3
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2334aeb17b..1c041e5814 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -354,10 +354,11 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- VWR-17801
+ STORM-596
STORM-616
STORM-679
- STORM-596
+ STORM-737
+ VWR-17801
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 17433a557b..c295f93a67 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -506,8 +506,7 @@ void LLPanelMainInventory::onFilterSelected()
return;
}
- BOOL recent_active = ("Recent Items" == mActivePanel->getName());
- getChildView("add_btn_panel")->setVisible( !recent_active);
+ getChildView("add_btn_panel")->setVisible(true);
setFilterSubString(mFilterSubString);
LLInventoryFilter* filter = mActivePanel->getFilter();