summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-05-05 12:29:53 +0300
committerMike Antipov <mantipov@productengine.com>2010-05-05 12:29:53 +0300
commit15413e44427c5cc332bcae65462498b349d15eba (patch)
tree6810fc91a7d5f04ccf24021eac436c627b4538bc /indra/newview/llpanelmaininventory.cpp
parent4bff09dcf42cda492f3cd74a5614fe1aec9b538e (diff)
Fixed major bug EXT-6797 (attempting to create new folder while viewing recent inventory renames newest item instead.)
Implemented Recent Inventory Panel specific classes to create appropriate context menu for Folders in Recent Items Panel: * Registered new LLInventoryRecentItemsPanel class * Added appropriate Folder Bridge and Bridge Builder Updated main inventory panel to not show "+" button on Recent Items tab * Placed controls into Layout Stack. * Change visibility of panel with "+" button while switching between tabs. * also made bottom panel wider to be consistent with other side panels (see screenshots). Reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/334/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 0ba373c51b..a84280c213 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -167,7 +167,7 @@ BOOL LLPanelMainInventory::postBuild()
// Now load the stored settings from disk, if available.
std::ostringstream filterSaveName;
filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, FILTERS_FILENAME);
- llinfos << "LLPanelMainInventory::init: reading from " << filterSaveName << llendl;
+ llinfos << "LLPanelMainInventory::init: reading from " << filterSaveName.str() << llendl;
llifstream file(filterSaveName.str());
LLSD savedFilterState;
if (file.is_open())
@@ -492,6 +492,10 @@ void LLPanelMainInventory::onFilterSelected()
{
return;
}
+
+ BOOL recent_active = ("Recent Items" == mActivePanel->getName());
+ childSetVisible("add_btn_panel", !recent_active);
+
setFilterSubString(mFilterSubString);
LLInventoryFilter* filter = mActivePanel->getFilter();
LLFloaterInventoryFinder *finder = getFinder();