diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-27 19:37:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-27 19:37:18 +0300 |
| commit | 0a6f28209e2be86462428a6f779b465e3604e831 (patch) | |
| tree | b968655ced36ef127b028819e9edb509861a76ca /indra/newview/llfloaterconversationlog.h | |
| parent | e008b44fd88be83426812e67707896e970947c49 (diff) | |
| parent | 817bc25b2732dc23295e6a7ac0da5ad142e33434 (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llfloaterconversationlog.h')
| -rw-r--r-- | indra/newview/llfloaterconversationlog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterconversationlog.h b/indra/newview/llfloaterconversationlog.h index 85ca37c530..c82237c108 100644 --- a/indra/newview/llfloaterconversationlog.h +++ b/indra/newview/llfloaterconversationlog.h @@ -29,6 +29,7 @@ #include "llfloater.h" class LLConversationLogList; +class LLMenuButton; class LLFloaterConversationLog : public LLFloater { @@ -50,6 +51,7 @@ private: bool isActionChecked(const LLSD& userdata); LLConversationLogList* mConversationLogList; + LLMenuButton* mConversationsGearBtn = nullptr; }; |