diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-11-09 22:55:29 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-11-09 23:25:02 +0100 |
| commit | 7ebaa2d2e55c6a9b7feeb684190628e340ad7920 (patch) | |
| tree | 506c00c18a41846d77f171fa4940c534cabf9060 /indra/newview/llchathistory.cpp | |
| parent | 6e79ca4959d98c0305ff1c158b5402f56aba5430 (diff) | |
| parent | b5033a8859b38df045cc74e074aaee864985f145 (diff) | |
Merge branch contribution/emoji into DRTVWR-489-emoji
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 7ff24f64ac..e7ce1c61b6 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1073,6 +1073,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)); |