diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-03-08 18:45:18 +0100 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2024-03-10 00:10:16 +0100 |
| commit | 326055ba82c22fedde186c6a56bafd4fe87e613a (patch) | |
| tree | 7159405b9a2d4dd82d945f403f5a4906865d6159 /indra/newview | |
| parent | 1781e2d17b777e32e9b51e5a901c1295db80a4d8 (diff) | |
viewer#944 [Emoji] Display should be consistent between llDialog text and llDialog buttons
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_notification.xml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index bf3f4c1e88..d64602d9b5 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -298,8 +298,8 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images ) // init font variables if (!sFont) { - sFont = LLFontGL::getFontSansSerif(); - sFontSmall = LLFontGL::getFontSansSerifSmall(); + sFont = LLFontGL::getFontEmojiMedium(); + sFontSmall = LLFontGL::getFontEmojiSmall(); } // initialize setFocusRoot(!mIsTip); diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index c1a68fb9af..d762b5bc84 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -32,7 +32,7 @@ <text border_visible="false" follows="left|right|top|bottom" - font="SansSerif" + font="Emoji" height="85" layout="topleft" left="10" @@ -46,7 +46,7 @@ <text border_visible="false" follows="left|right|top|bottom" - font="SansSerifBold" + font="EmojiBold" height="85" layout="topleft" left="10" @@ -57,14 +57,14 @@ width="285" wrap="true"/> <text_editor - h_pad="0" - v_pad="0" + h_pad="0" + v_pad="0" bg_readonly_color="Transparent" border_visible="false" embedded_items="false" enabled="false" follows="left|right|top|bottom" - font="SansSerif" + font="Emoji" height="85" layout="topleft" left="10" |