diff options
author | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
commit | d26567915cd80999260edffc41df467a7cbbd80c (patch) | |
tree | 84072d2a7a5e6afa7b57850ed4b325439cb2be16 /indra/newview/llprogressview.cpp | |
parent | 7528855442a100cee379b9e409280a69caa78bba (diff) | |
parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) |
Merge with Master after Viewer release
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rw-r--r-- | indra/newview/llprogressview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 3e3ab3a676..416848f9af 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -431,9 +431,10 @@ void LLProgressView::initLogos() // 108x41 icon_width = 74; + icon_height = default_height; loadLogo(temp_str + "vivox_logo.png", image_codec, - LLRect(texture_start_x, texture_start_y + default_height, texture_start_x + icon_width, texture_start_y), + LLRect(texture_start_x, texture_start_y + icon_height, texture_start_x + icon_width, texture_start_y), default_clip, default_clip); } |