From 40418c388cac19ee11deb901fe23166d63e91ba9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 5 May 2020 21:08:23 +0300
Subject: [PATCH] Fixed conflict caused by SL-13178
---
indra/newview/llinventorypanel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index cd504392e65..c202333f452 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -405,7 +405,7 @@ class LLAssetFilteredInventoryPanel : public LLInventoryPanel
std::string& tooltip_msg) override;
protected:
- /*virtual*/ LLFolderViewItem* buildNewViews(const LLUUID& id) override;
+ /*virtual*/ bool typedViewsFilter(const LLUUID& id, LLInventoryObject const* objectp) override;
/*virtual*/ void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item) override;
private:
--
GitLab