diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-05 01:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 01:05:08 +0200 |
| commit | 25251c3ba81629f3234fc94c0368cd6300732b09 (patch) | |
| tree | 03ababecc49376c0e607b3548d9beb596f79c3a7 /indra/newview/llhudrender.cpp | |
| parent | d47c6536820d1ed6e373147678dd0fab90e80ab8 (diff) | |
| parent | b68a05e7c30930976ed1273b4c7a0fec01d2a84f (diff) | |
Merge pull request #924 from secondlife/marchcat/x-merge
Emoji -> Maint X merge
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(); |