summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2022-09-11 21:44:00 +0100
committerKitty Barnett <develop@catznip.com>2022-10-23 16:26:36 +0200
commitcf2afdc541b540582650f89c6b95aacfeaef516f (patch)
treef323d0d17184c7aef6ba56ee47f0913ebbdf296b /indra/llrender/llfontgl.cpp
parentbab70f6f152952ce755188d29bea1cfd8821a4be (diff)
Add emoji as its own font to promote character reuse
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r--indra/llrender/llfontgl.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 4770f79395..e9899c9567 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1005,6 +1005,13 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
return gl_vfont_align;
}
+ //static
+LLFontGL* LLFontGL::getFontEmoji()
+{
+ static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
+ return fontp;;
+}
+
//static
LLFontGL* LLFontGL::getFontMonospace()
{