EXP-962 Share button in Inventory Recent tab blinks when no recent items are listed

1 files changed, 7 insertions, 3 deletions

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<LLPanelMainInventory>("panel_main_inventory");
 
 	LLInventoryPanel* inbox = findChild<LLInventoryPanel>("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;
 }