diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 17:17:54 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 17:17:54 +0300 |
| commit | 2e238f0ba85f290582cf900a9e2f76eeb8528280 (patch) | |
| tree | e8754ffafe9dfed4d3279e252b23c86f42da2589 | |
| parent | 36c27bf5ec5075efa8f66c70b30eb618fb3e39e2 (diff) | |
SL-12665 Readjusted all logos
| -rw-r--r-- | indra/newview/llprogressview.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/vivox_logo.png | bin | 1740 -> 2331 bytes |
2 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 3251ad3605..e9b1b5ea73 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -381,8 +381,8 @@ void LLProgressView::initLogos() const U8 image_codec = IMG_CODEC_PNG; const LLRectf default_clip(0.f, 1.f, 1.f, 0.f); - const S32 default_height = 32; - const S32 default_pad = 25; + const S32 default_height = 28; + const S32 default_pad = 15; S32 icon_width, icon_height; @@ -402,9 +402,9 @@ void LLProgressView::initLogos() #ifdef LL_FMODSTUDIO // original image size is 264x96, it is on longer side but // with no internal paddings so it gets additional padding - icon_width = 87; - icon_height = 23; - S32 pad_y = 5; + icon_width = 77; + icon_height = 21; + S32 pad_y = 4; texture_start_x++; loadLogo(temp_str + "fmod_logo.png", image_codec, @@ -416,8 +416,8 @@ void LLProgressView::initLogos() #endif // original image size is 342x113, central element is on a larger side // plus internal padding, so it gets slightly more height than desired 32 - icon_width = 100; - icon_height = 33; + icon_width = 88; + icon_height = 29; pad_y = -1; loadLogo(temp_str + "havok_logo.png", image_codec, @@ -427,7 +427,8 @@ void LLProgressView::initLogos() texture_start_x += icon_width + default_pad; - icon_width = 87; + // 108x41 + icon_width = 74; 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), diff --git a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png Binary files differindex 6bbd050eae..6f20e87b7a 100644 --- a/indra/newview/skins/default/textures/3p_icons/vivox_logo.png +++ b/indra/newview/skins/default/textures/3p_icons/vivox_logo.png |
