diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:14:24 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-11 22:14:24 +0200 |
| commit | 0303dd817913c67ef3c809492866ce5e949f0ffd (patch) | |
| tree | 8759e55242c12f1de7f345b730b971cd5f226a9b /indra/newview/llconversationmodel.h | |
| parent | 6154e72d94cd7dc211f42843988776e3775fd2e4 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 80385fad5f..30c7481864 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -96,6 +96,7 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags) { } virtual BOOL isUpToDate() const { return TRUE; } virtual bool hasChildren() const { return FALSE; } + virtual void addChild(LLFolderViewModelItem* child); virtual bool potentiallyVisible() { return true; } virtual bool filter( LLFolderViewFilter& filter) { return false; } |