diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-11-09 22:55:29 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-11-09 23:25:02 +0100 |
| commit | 7ebaa2d2e55c6a9b7feeb684190628e340ad7920 (patch) | |
| tree | 506c00c18a41846d77f171fa4940c534cabf9060 /indra/newview/llhudrender.cpp | |
| parent | 6e79ca4959d98c0305ff1c158b5402f56aba5430 (diff) | |
| parent | b5033a8859b38df045cc74e074aaee864985f145 (diff) | |
Merge branch contribution/emoji into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llhudrender.cpp')
| -rw-r--r-- | indra/newview/llhudrender.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp index dff310ecf9..c1f17c9d33 100644 --- a/indra/newview/llhudrender.cpp +++ b/indra/newview/llhudrender.cpp @@ -138,7 +138,7 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent, LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f)); F32 right_x; - font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x); + font.render(wstr, 0, 0, 1, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x, /*use_ellipses*/false, /*use_color*/true); LLUI::popMatrix(); gGL.popMatrix(); |