From 781fded069d877ea9c07d5e5077178f65ef82e7a Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Tue, 13 Sep 2011 14:26:02 -0700 Subject: EXP-1010 FIX -- Received Items panel scroll snaps to current selection when Direct Delivery folders with a large # of items are being delivered from Marketplace * Updated the inventory filter isNotDefault() function to properly check the filter types and filter links flags against the default filter ops. * Updated the inbox and outbox to mark their date sort order as the default. Reviewed by Leyla. --- indra/newview/llpanelmarketplaceoutbox.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelmarketplaceoutbox.cpp') diff --git a/indra/newview/llpanelmarketplaceoutbox.cpp b/indra/newview/llpanelmarketplaceoutbox.cpp index 839369bffe..73fb92ff72 100644 --- a/indra/newview/llpanelmarketplaceoutbox.cpp +++ b/indra/newview/llpanelmarketplaceoutbox.cpp @@ -117,8 +117,11 @@ LLInventoryPanel * LLPanelMarketplaceOutbox::setupInventoryPanel() LLRect inventory_placeholder_rect = outbox_inventory_placeholder->getRect(); mInventoryPanel->setShape(inventory_placeholder_rect); - // Set the sort order newest to oldest, and a selection change callback + // Set the sort order newest to oldest mInventoryPanel->setSortOrder(LLInventoryFilter::SO_DATE); + mInventoryPanel->getFilter()->markDefault(); + + // Set selection callback for proper update of inventory status buttons mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceOutbox::onSelectionChange, this)); // Set up the note to display when the outbox is empty -- cgit v1.2.3