diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-11 16:51:15 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-11 16:51:15 +0100 |
| commit | da1778e19b98508d66e0288a773e55bb86e118a0 (patch) | |
| tree | e50e5e2a18ac6160b65d23615143c809694ceb7b /indra/newview/llinventorypanel.cpp | |
| parent | 55d40245b4456ccf6a3f87ed488b0c5d05e54232 (diff) | |
| parent | de34937c50492cb9d79859af000554d876ef7267 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index d8c2de649e..fb010fa858 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -988,7 +988,6 @@ LLFolderViewItem* LLInventoryPanel::buildNewViews(const LLUUID& id, LLInventoryO ++item_iter) { const LLViewerInventoryItem* item = (*item_iter); - if (item->getType() == LLAssetType::AT_SETTINGS) buildNewViews(item->getUUID()); } } @@ -1769,8 +1768,8 @@ public: ~LLAssetFilteredInventoryPanel() {} protected: - /*virtual*/ LLFolderViewItem* buildNewViews(const LLUUID& id); - /*virtual*/ void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item); + /*virtual*/ LLFolderViewItem* buildNewViews(const LLUUID& id) override; + /*virtual*/ void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item) override; private: LLAssetType::EType mAssetType; @@ -1785,11 +1784,10 @@ void LLAssetFilteredInventoryPanel::initFromParams(const Params& p) filter_cats &= ~(1ULL << LLFolderType::FT_TRASH); filter_cats &= ~(1ULL << LLFolderType::FT_MARKETPLACE_LISTINGS); getFilter().setFilterCategoryTypes(filter_cats); - // turn off marketplace for recent items getFilter().setFilterNoMarketplaceFolder(); } -LLFolderViewItem* LLAssetFilteredInventoryPanel::buildNewViews(const LLUUID& id) +LLFolderViewItem* LLAssetFilteredInventoryPanel::buildNewViews(const LLUUID& id) { LLInventoryObject const* objectp = gInventory.getObject(id); @@ -1806,7 +1804,7 @@ LLFolderViewItem* LLAssetFilteredInventoryPanel::buildNewViews(const LLUUID& id) return LLInventoryPanel::buildNewViews(id, objectp); } -void LLAssetFilteredInventoryPanel::itemChanged(const LLUUID& id, U32 mask, const LLInventoryObject* model_item) +void LLAssetFilteredInventoryPanel::itemChanged(const LLUUID& id, U32 mask, const LLInventoryObject* model_item) { if (!model_item) { |