diff options
author | Kitty Barnett <develop@catznip.com> | 2022-11-08 01:14:10 +0100 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2022-11-08 01:25:45 +0100 |
commit | f3e7c7454f6647aa09f220baa20c9bbc7480a37b (patch) | |
tree | d76c4a2cadba1b1513e526155e2143303a07a78e /indra/newview/llchathistory.cpp | |
parent | 17a3924a28770e6910022ad8f627bb8e2b667730 (diff) |
Enable color emojis (and the emoji helper) on the chat history and editor
Diffstat (limited to 'indra/newview/llchathistory.cpp')
-rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index c110e0d815..f07d4658f9 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1010,6 +1010,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) editor_params.enabled = false; // read only editor_params.show_context_menu = "true"; editor_params.trusted_content = false; + editor_params.text_valign = LLFontGL::VAlign::VCENTER; + editor_params.use_color = true; mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); mEditor->setIsFriendCallback(LLAvatarActions::isFriend); mEditor->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstance(), _1, _2, 0)); |