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.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index d478922617..7babc92897 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -140,7 +140,7 @@ protected:
/* virtual */ void onFocusReceived();
// prepare chat's params and out one message to chatHistory
- void appendMessage(const LLChat& chat, const LLSD &args = 0);
+ void appendMessage(const LLChat& chat, const LLSD& args = LLSD());
std::string appendTime();
void assignResizeLimits();
@@ -182,6 +182,7 @@ protected:
LLButton* mExpandCollapseLineBtn;
LLButton* mExpandCollapseBtn;
LLButton* mTearOffBtn;
+ LLButton* mEmojiBtn;
LLButton* mCloseBtn;
LLButton* mGearBtn;
LLButton* mAddBtn;
@@ -207,6 +208,10 @@ private:
void onInputEditorClicked();
+ static void onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self);
+ void onEmojiPicked(llwchar emoji);
+ void onEmojiPickerClosed();
+
bool checkIfTornOff();
bool mIsHostAttached;
bool mHasVisibleBeenInitialized;