From 066dfaee2866ff7585387db50ceca391a4ecb519 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 7 Dec 2010 10:14:07 -0500 Subject: Add + control to Inventory/Recent tab --- indra/newview/llpanelmaininventory.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.cpp') 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(); -- cgit v1.2.3 From 971eb7f198371febbf7458f0df7359ef5f8c70b9 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 23 Dec 2010 15:56:15 -0500 Subject: STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all menu items except "New Folder" when right clicking an item. --- indra/newview/llpanelmaininventory.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index c295f93a67..efe84887b5 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -943,6 +943,10 @@ void LLPanelMainInventory::updateListCommands() void LLPanelMainInventory::onAddButtonClick() { + + BOOL recent_active = ("Recent Items" == mActivePanel->getName()); + mMenuAdd->getChild("New Folder")->setEnabled(!recent_active); + setUploadCostIfNeeded(); showActionMenu(mMenuAdd,"add_btn"); -- cgit v1.2.3 From 5d4b4a185914558831546a15730780cea5e560e7 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 24 Dec 2010 15:28:46 -0500 Subject: STORM-737 Removed unnecessary blank link from llpanelmaininventory.cpp --- indra/newview/llpanelmaininventory.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index efe84887b5..5e280ef98f 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -943,7 +943,6 @@ void LLPanelMainInventory::updateListCommands() void LLPanelMainInventory::onAddButtonClick() { - BOOL recent_active = ("Recent Items" == mActivePanel->getName()); mMenuAdd->getChild("New Folder")->setEnabled(!recent_active); -- cgit v1.2.3 From 5e9e350debb83e35a9a58f3ac1bb6eba410f6f8f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 24 Dec 2010 18:09:08 -0500 Subject: STORM-737 Added comment. Combined code to eliminate temporary constant. --- indra/newview/llpanelmaininventory.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 5e280ef98f..4e2fca9f9e 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -943,8 +943,9 @@ void LLPanelMainInventory::updateListCommands() void LLPanelMainInventory::onAddButtonClick() { - BOOL recent_active = ("Recent Items" == mActivePanel->getName()); - mMenuAdd->getChild("New Folder")->setEnabled(!recent_active); +// 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("New Folder")->setEnabled(mActivePanel->getName() != "Recent Items"); setUploadCostIfNeeded(); -- cgit v1.2.3 From 3b20ce511061e364e85540c40d274cc9a5b06fe2 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 27 Dec 2010 08:58:21 -0500 Subject: STORM-737 A little more code cleanup per Code Review suggestions. --- indra/newview/llpanelmaininventory.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.cpp') 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("New Folder")->setEnabled(mActivePanel->getName() != "Recent Items"); + bool recent_active = ("Recent Items" == mActivePanel->getName()); + mMenuAdd->getChild("New Folder")->setEnabled(!recent_active); setUploadCostIfNeeded(); -- cgit v1.2.3 From 5e376017858f6534163b0bfb6b385bdd0aeac5d3 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 27 Dec 2010 12:06:28 -0500 Subject: STORM-737 Eliminate commented out line --- indra/newview/llpanelmaininventory.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llpanelmaininventory.cpp') diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 9c1d884046..c83176d980 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -506,8 +506,6 @@ void LLPanelMainInventory::onFilterSelected() return; } -// getChildView("add_btn_panel")->setVisible(true); - setFilterSubString(mFilterSubString); LLInventoryFilter* filter = mActivePanel->getFilter(); LLFloaterInventoryFinder *finder = getFinder(); -- cgit v1.2.3