diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-05 21:08:23 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-05 21:09:42 +0300 |
| commit | 40418c388cac19ee11deb901fe23166d63e91ba9 (patch) | |
| tree | 8b5f35199bd636e8241268abfc13aabd241c0dcd | |
| parent | e1504d8c562d11d538bcbafc6ffd22d56ff38491 (diff) | |
Fixed conflict caused by SL-13178
| -rw-r--r-- | indra/newview/llinventorypanel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index cd504392e6..c202333f45 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -405,7 +405,7 @@ public: 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: |