livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer#944 [Emoji] Display should be consistent between llDialog text and llDialog buttons

meow-7.2.2
Alexander Gavriliuk 2024-03-08 18:45:18 +01:00 committed by Guru
parent 1781e2d17b
commit 326055ba82
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lltoastnotifypanel.cpp
View File

@ -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);

10
indra/newview/skins/default/xui/en/panel_notification.xml
View File

@ -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"