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/newview/lltextureview.cpp | |
| parent | 717fe2cc5c35151f4712519f649276d4877d09a3 (diff) | |
| parent | d58b530e805e2b3c943b1ff446ac84a10c500b32 (diff) | |
Merge branch 'contribution/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 7a0f69fed5..29221c0bc5 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -612,7 +612,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")); |