From 326055ba82c22fedde186c6a56bafd4fe87e613a Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 8 Mar 2024 18:45:18 +0100
Subject: [PATCH] viewer#944 [Emoji] Display should be consistent between
 llDialog text and llDialog buttons

---
 indra/newview/lltoastnotifypanel.cpp                   |  4 ++--
 .../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 bf3f4c1e889..d64602d9b50 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 c1a68fb9af4..d762b5bc840 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"