summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/lltoastnotifypanel.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/panel_notification.xml6
2 files changed, 5 insertions, 5 deletions
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 @@
<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"