summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2010-12-27 08:58:21 -0500
committerJonathan Yap <none@none>2010-12-27 08:58:21 -0500
commit3b20ce511061e364e85540c40d274cc9a5b06fe2 (patch)
tree279e97fcae1ddf8c6c6fe17a2787278f044f400a /indra/newview
parent5e9e350debb83e35a9a58f3ac1bb6eba410f6f8f (diff)
STORM-737 A little more code cleanup per Code Review suggestions.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelmaininventory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 4e2fca9f9e..9c1d884046 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -506,7 +506,7 @@ void LLPanelMainInventory::onFilterSelected()
return;
}
- getChildView("add_btn_panel")->setVisible(true);
+// getChildView("add_btn_panel")->setVisible(true);
setFilterSubString(mFilterSubString);
LLInventoryFilter* filter = mActivePanel->getFilter();
@@ -945,7 +945,8 @@ void LLPanelMainInventory::onAddButtonClick()
{
// Gray out the "New Folder" option when the Recent tab is active as new folders will not be displayed
// unless "Always show folders" is checked in the filter options.
- mMenuAdd->getChild<LLMenuItemGL>("New Folder")->setEnabled(mActivePanel->getName() != "Recent Items");
+ bool recent_active = ("Recent Items" == mActivePanel->getName());
+ mMenuAdd->getChild<LLMenuItemGL>("New Folder")->setEnabled(!recent_active);
setUploadCostIfNeeded();