diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:29:21 +0300 |
| commit | 3a4720d1f523ca8ebee0d963604c236c08980eae (patch) | |
| tree | ff5c6adb045d104aa3cce6c6c68e63e3c55659cb /indra/newview/lltextureview.cpp | |
| parent | 34c13264f33d9bbfc73302b84c8fade1b115fb93 (diff) | |
| parent | 169599fd2f211d66f80a54e13daf975229607022 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/en/floater_fast_timers.xml
# indra/newview/viewer_manifest.py
# indra/test/test.cpp
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index e5a61b359d..9eaee2e326 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -415,12 +415,14 @@ void LLAvatarTexBar::draw() text_color, LLFontGL::LEFT, LLFontGL::TOP); //, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT); line_num++; } + const U32 texture_timeout = gSavedSettings.getU32("AvatarBakedTextureUploadTimeout"); const U32 override_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel"); LLColor4 header_color(1.f, 1.f, 1.f, 0.9f); + const std::string texture_timeout_str = texture_timeout ? llformat("%d", texture_timeout) : "Disabled"; const std::string override_tex_discard_level_str = override_tex_discard_level ? llformat("%d",override_tex_discard_level) : "Disabled"; - std::string header_text = llformat("[ Timeout:60 ] [ LOD_Override('TextureDiscardLevel'):%s ]", override_tex_discard_level_str.c_str()); + std::string header_text = llformat("[ Timeout('AvatarBakedTextureUploadTimeout'):%s ] [ LOD_Override('TextureDiscardLevel'):%s ]", texture_timeout_str.c_str(), override_tex_discard_level_str.c_str()); LLFontGL::getFontMonospace()->renderUTF8(header_text, 0, l_offset, v_offset + line_height*line_num, header_color, LLFontGL::LEFT, LLFontGL::TOP); //, LLFontGL::BOLD, LLFontGL::DROP_SHADOW_SOFT); line_num++; |