diff options
author | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2022-08-28 00:08:38 +0200 |
commit | 5440464a9cbff6f64f79667ac026a7a1983b28b4 (patch) | |
tree | 26a643a95e6aa99995ce728e4d2bf21cbdaa2c59 /indra/llui/llview.cpp | |
parent | 717fe2cc5c35151f4712519f649276d4877d09a3 (diff) | |
parent | d58b530e805e2b3c943b1ff446ac84a10c500b32 (diff) |
Merge branch 'contribution/emoji'
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r-- | indra/llui/llview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index b942be2a4a..2781c991a7 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1325,7 +1325,7 @@ void LLView::drawDebugRect() debug_rect.getWidth(), debug_rect.getHeight()); LLFontGL::getFontSansSerifSmall()->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color, LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, - S32_MAX, S32_MAX, NULL, FALSE); + S32_MAX, S32_MAX, NULL, /*use_ellipses*/FALSE, /*use_color*/FALSE); } } LLUI::popMatrix(); |