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/lltextureview.cpp | |
| parent | 6e79ca4959d98c0305ff1c158b5402f56aba5430 (diff) | |
| parent | b5033a8859b38df045cc74e074aaee864985f145 (diff) | |
Merge branch contribution/emoji into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index b74577315e..967ea85a84 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -614,7 +614,7 @@ void LLGLTexMemBar::draw() LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0, v_offset + line_height*3, text_color, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, - &x_right, FALSE); + &x_right, /*use_ellipses*/FALSE, /*use_color*/FALSE); F32Kilobits bandwidth(LLAppViewer::getTextureFetch()->getTextureBandwidth()); F32Kilobits max_bandwidth(gSavedSettings.getF32("ThrottleBandwidthKBPS")); |