Merge branch 'develop' into nat/edu-channel

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llfloaterconversationlog.h b/indra/newview/llfloaterconversationlog.h
index 9327fae227..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
 {
@@ -37,9 +38,9 @@ public:
     LLFloaterConversationLog(const LLSD& key);
     virtual ~LLFloaterConversationLog(){};
 
-    virtual BOOL postBuild();
+    bool postBuild() override;
 
-    virtual void draw();
+    void draw() override;
 
     void onFilterEdit(const std::string& search_string);
 
@@ -50,6 +51,7 @@ private:
     bool isActionChecked(const LLSD& userdata);
 
     LLConversationLogList* mConversationLogList;
+    LLMenuButton*          mConversationsGearBtn = nullptr;
 };