From f496800098bfb06b488dc5f5141403ea46f54759 Mon Sep 17 00:00:00 2001 From: Henri Beauchamp Date: Thu, 14 Mar 2024 10:22:21 +0100 Subject: Revert 326055ba82c22fedde186c6a56bafd4fe87e613a after 2f452d06e6964b0edf26b0b3f6eaa156e3fa2d48 It is necessary to revert commit 326055ba82c22fedde186c6a56bafd4fe87e613a for 2f452d06e6964b0edf26b0b3f6eaa156e3fa2d48 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. --- indra/newview/lltoastnotifypanel.cpp | 4 ++-- indra/newview/skins/default/xui/en/panel_notification.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra') diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index d64602d9b5..bf3f4c1e88 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::getFontEmojiMedium(); - sFontSmall = LLFontGL::getFontEmojiSmall(); + sFont = LLFontGL::getFontSansSerif(); + sFontSmall = LLFontGL::getFontSansSerifSmall(); } // 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 d762b5bc84..e962c1449a 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 @@