summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llfontgl.cpp12
-rw-r--r--indra/llrender/llfontgl.h1
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 001b7fd7b8..c95890981f 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -193,7 +193,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
if (-1 == max_chars)
{
- length = (S32)wstr.length() - begin_offset;
+ max_chars = length = (S32)wstr.length() - begin_offset;
}
else
{
@@ -254,7 +254,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL;
-
BOOL draw_ellipses = FALSE;
if (use_ellipses)
{
@@ -1024,7 +1023,7 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
return gl_vfont_align;
}
- //static
+//static
LLFontGL* LLFontGL::getFontEmoji()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
@@ -1032,6 +1031,13 @@ LLFontGL* LLFontGL::getFontEmoji()
}
//static
+LLFontGL* LLFontGL::getFontEmojiHuge()
+{
+ static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Huge", 0));
+ return fontp;;
+}
+
+//static
LLFontGL* LLFontGL::getFontMonospace()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Monospace","Monospace",0));
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 915c2439a3..356cfaf404 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -195,6 +195,7 @@ public:
static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
static LLFontGL* getFontEmoji();
+ static LLFontGL* getFontEmojiHuge();
static LLFontGL* getFontMonospace();
static LLFontGL* getFontSansSerifSmall();
static LLFontGL* getFontSansSerif();