diff options
| author | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2023-01-20 16:23:41 -0800 |
| commit | cbb7480ca76cbe11c40f05a269583201dd044796 (patch) | |
| tree | 8ce39d5a975d66a5c6a38e47460c2330f15a087e /indra/newview/lltextureview.cpp | |
| parent | 80bc32c3efe77b49adcd4cc00320ce5523f90fb9 (diff) | |
| parent | 12204b210e5279b0bfba5601d34195739cab6ab8 (diff) | |
Fix merge conflicts after auto merge
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 cf9211767e..4431f6527d 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -613,7 +613,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")); |