diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-09 19:00:48 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 19:00:48 +0000 |
| commit | ac6d2b09c048d8589c572acb2965a0643b07d5ce (patch) | |
| tree | 4592bf63d6fc464c9e1a961e4b64af4233ab93bf /indra/newview/llinventorypanel.h | |
| parent | c2cbb40a0eecb1c3b4a21ffa4d169f23f1e7006b (diff) | |
| parent | 83b508a656aebedff915b2fdcd292432a8aaa7b2 (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #137)
SL-9746 [EEP] Local Texture options should work with EEP
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index b968b19d9a..90fd659522 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -319,9 +319,7 @@ protected: static LLUIColor sLibraryColor; static LLUIColor sLinkColor; - virtual LLFolderViewItem* buildNewViews(const LLUUID& id); - LLFolderViewItem* buildNewViews(const LLUUID& id, LLInventoryObject const* objectp); - virtual void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item); + LLFolderViewItem* buildNewViews(const LLUUID& id); BOOL getIsHiddenFolderType(LLFolderType::EType folder_type) const; virtual LLFolderView * createFolderRoot(LLUUID root_id ); |