diff options
| author | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
| commit | cbb7480ca76cbe11c40f05a269583201dd044796 (patch) | |
| tree | 8ce39d5a975d66a5c6a38e47460c2330f15a087e /indra/newview/llchathistory.cpp | |
| parent | 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 (diff) | |
| parent | 12204b210e5279b0bfba5601d34195739cab6ab8 (diff) | |
Fix merge conflicts after auto merge
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 7188b9136c..9e4d8c5fa7 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -1074,6 +1074,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)); |