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

… and llDialog buttons
AiraYumi · Mar 9, 2024 · 326055b · 326055b
1 parent 1781e2d
commit 326055b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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"