summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsessiontab.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.h')
-rw-r--r--indra/newview/llfloaterimsessiontab.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index ddffed57a3..cc985b2753 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -189,7 +189,7 @@ protected:
LLButton* mExpandCollapseBtn;
LLButton* mTearOffBtn;
LLButton* mEmojiRecentPanelToggleBtn;
- LLButton* mEmojiPickerToggleBtn;
+ LLButton* mEmojiPickerShowBtn;
LLButton* mCloseBtn;
LLButton* mGearBtn;
LLButton* mAddBtn;
@@ -215,12 +215,10 @@ private:
void onInputEditorClicked();
- static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
- static void onEmojiPickerToggleBtnClicked();
- void initEmojiRecentPanel(bool moveFocus);
+ void onEmojiRecentPanelToggleBtnClicked();
+ void onEmojiPickerShowBtnClicked();
+ void initEmojiRecentPanel();
void onRecentEmojiPicked(const LLSD& value);
- static void onEmojiPicked(llwchar emoji);
- static void onEmojiPickerClosed();
bool checkIfTornOff();
bool mIsHostAttached;