diff -r e843e274fa58 doc/contributions.txt --- a/doc/contributions.txt Sun Dec 05 06:34:17 2010 -0800 +++ b/doc/contributions.txt Thu Dec 23 16:01:31 2010 -0500 @@ -354,10 +354,11 @@ 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 -r e843e274fa58 indra/newview/llinventorybridge.cpp --- a/indra/newview/llinventorybridge.cpp Sun Dec 05 06:34:17 2010 -0800 +++ b/indra/newview/llinventorybridge.cpp Thu Dec 23 16:01:31 2010 -0500 @@ -5320,11 +5320,6 @@ menuentry_vec_t disabled_items, items = getMenuItems(); - items.erase(std::remove(items.begin(), items.end(), std::string("New Body Parts")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Clothes")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Note")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Gesture")), items.end()); - items.erase(std::remove(items.begin(), items.end(), std::string("New Script")), items.end()); items.erase(std::remove(items.begin(), items.end(), std::string("New Folder")), items.end()); hide_context_entries(menu, items, disabled_items); diff -r e843e274fa58 indra/newview/llpanelmaininventory.cpp --- a/indra/newview/llpanelmaininventory.cpp Sun Dec 05 06:34:17 2010 -0800 +++ b/indra/newview/llpanelmaininventory.cpp Thu Dec 23 16:01:31 2010 -0500 @@ -506,8 +506,7 @@ 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(); @@ -944,6 +943,10 @@ void LLPanelMainInventory::onAddButtonClick() { + + BOOL recent_active = ("Recent Items" == mActivePanel->getName()); + mMenuAdd->getChild("New Folder")->setEnabled(!recent_active); + setUploadCostIfNeeded(); showActionMenu(mMenuAdd,"add_btn");