From 3a3d0661b801e015df6ac960be2d2787b16d1688 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 30 Jun 2011 14:58:36 -0700 Subject: EXP-962 Share button in Inventory Recent tab blinks when no recent items are listed --- indra/newview/llsidepanelinventory.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index f769612f3f..caadefeaf3 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -557,12 +557,16 @@ bool LLSidepanelInventory::canShare() mInventoryPanel->findChild("panel_main_inventory"); LLInventoryPanel* inbox = findChild("inventory_inbox"); + + // Avoid flicker in the Recent tab while inventory is being loaded. + if ( (!inbox || inbox->getRootFolder()->getSelectionList().empty()) + && (panel_main_inventory && !panel_main_inventory->getActivePanel()->getRootFolder()->hasVisibleChildren()) ) + { + return false; + } return ( (panel_main_inventory ? LLAvatarActions::canShareSelectedItems(panel_main_inventory->getActivePanel()) : false) || (inbox ? LLAvatarActions::canShareSelectedItems(inbox) : false) ); - - // Avoid flicker in the Recent tab while inventory is being loaded. - //if (!active_panel->getRootFolder()->hasVisibleChildren()) return false; } -- cgit v1.2.3