diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
| commit | 1204468415dd5248bbd01d7aaede520ede3b9d36 (patch) | |
| tree | b378b94ff7266ce5c7f719b3ba55c836837869e9 /indra/newview/llhudrender.cpp | |
| parent | 0f2248ea12713822c546e362487aa94bb29e2899 (diff) | |
| parent | 1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff) | |
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
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(); |