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

Revert 326055ba82 after 2f452d06e6 

It is necessary to revert commit 326055ba82
for 2f452d06e6 to work its magic and repair
script dialogs so that they render as they used to before the emojis fonts
introduction.

Note that this revert won't prevent to use the new emojis should scripters
want them in their new scripted dialogs: it just ensures existing scripted
dialogs using special UTF-8 characters (which are not genuine emojis) will
render as they used to, using the monochrome fallback fonts.
meow-7.2.2
Henri Beauchamp 2024-03-14 10:22:21 +01:00 committed by Andrey Lihatskiy
parent 56c88b8343
commit f496800098
2 changed files with 5 additions and 5 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::getFontEmojiMedium();
sFontSmall = LLFontGL::getFontEmojiSmall();
sFont = LLFontGL::getFontSansSerif();
sFontSmall = LLFontGL::getFontSansSerifSmall();
}
// initialize
setFocusRoot(!mIsTip);

6
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="Emoji"
font="SansSerif"
height="85"
layout="topleft"
left="10"
@ -46,7 +46,7 @@
<text
border_visible="false"
follows="left|right|top|bottom"
font="EmojiBold"
font="SansSerifBold"
height="85"
layout="topleft"
left="10"
@ -64,7 +64,7 @@
embedded_items="false"
enabled="false"
follows="left|right|top|bottom"
font="Emoji"
font="SansSerif"
height="85"
layout="topleft"
left="10"