FIRE-21948: Show element count in Received Items folder Firestorm_5.0.11

Mon, 18 Dec 2017 13:28:32 +0100

author
Ansariel
date
Mon, 18 Dec 2017 13:28:32 +0100
branch
Firestorm_5.0.11
changeset 53579
01185fe23ddf
parent 53578
e2b9802ae72c
child 53580
1ccfdab73dc3

FIRE-21948: Show element count in Received Items folder

indra/newview/llpanelmarketplaceinbox.cpp file | annotate | diff | revisions
indra/newview/llpanelmarketplaceinbox.h file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanelmarketplaceinbox.cpp	Sat Dec 16 12:20:30 2017 +0100
     1.2 +++ b/indra/newview/llpanelmarketplaceinbox.cpp	Mon Dec 18 13:28:32 2017 +0100
     1.3 @@ -69,11 +69,17 @@
     1.4  	return TRUE;
     1.5  }
     1.6  
     1.7 -void LLPanelMarketplaceInbox::onSelectionChange()
     1.8 +// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
     1.9 +//void LLPanelMarketplaceInbox::onSelectionChange()
    1.10 +void LLPanelMarketplaceInbox::onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action)
    1.11 +// </FS:Ansariel>
    1.12  {
    1.13  	LLSidepanelInventory* sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory");
    1.14  		
    1.15  	sidepanel_inventory->updateVerbs();
    1.16 +
    1.17 +	// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
    1.18 +	mInventoryPanel->onSelectionChange(items, user_action);
    1.19  }
    1.20  
    1.21  
    1.22 @@ -98,7 +104,10 @@
    1.23  	mInventoryPanel->getFilter().markDefault();
    1.24  
    1.25  	// Set selection callback for proper update of inventory status buttons
    1.26 -	mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
    1.27 +	// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
    1.28 +	//mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this));
    1.29 +	mInventoryPanel->setSelectCallback(boost::bind(&LLPanelMarketplaceInbox::onSelectionChange, this, _1, _2));
    1.30 +	// </FS:Ansariel>
    1.31  
    1.32  	// Set up the note to display when the inbox is empty
    1.33  	mInventoryPanel->getFilter().setEmptyLookupMessage("InventoryInboxNoItems");
     2.1 --- a/indra/newview/llpanelmarketplaceinbox.h	Sat Dec 16 12:20:30 2017 +0100
     2.2 +++ b/indra/newview/llpanelmarketplaceinbox.h	Mon Dec 18 13:28:32 2017 +0100
     2.3 @@ -28,6 +28,7 @@
     2.4  #define LL_LLPANELMARKETPLACEINBOX_H
     2.5  
     2.6  #include "llpanel.h"
     2.7 +#include "llfolderview.h"
     2.8  
     2.9  class LLButton;
    2.10  class LLInventoryPanel;
    2.11 @@ -63,7 +64,10 @@
    2.12  
    2.13  private:
    2.14  
    2.15 -	void onSelectionChange();
    2.16 +	// <FS:Ansariel> FIRE-21948: Show element count in Received Items folder
    2.17 +	//void onSelectionChange();
    2.18 +	void onSelectionChange(const std::deque<LLFolderViewItem*>& items, BOOL user_action);
    2.19 +	// </FS:Ansariel>
    2.20  
    2.21  	void onFocusReceived();
    2.22  

mercurial