diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 10:09:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-05-28 11:25:04 +0300 |
| commit | c47516c4421dc3736cf0dbe70a5eba02c90d9a8e (patch) | |
| tree | 22981dc13eeaa0029f3b156401be543cf5acabd8 | |
| parent | d23e6491691be7f1937b78910e7c20b7741a890c (diff) | |
SL-12607 Reverted to original logos
| -rw-r--r-- | indra/newview/llprogressview.cpp | 21 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/fmod_logo.png | bin | 1732 -> 14486 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/3p_icons/havok_logo.png | bin | 2586 -> 41488 bytes |
3 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index afda384c84..767cdd9388 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -384,7 +384,7 @@ void LLProgressView::initLogos() const S32 default_height = 32; const S32 default_pad = 25; - S32 icon_width; + S32 icon_width, icon_height; // We don't know final screen rect yet, so we can't precalculate position fully LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl"); @@ -400,20 +400,27 @@ void LLProgressView::initLogos() temp_str += gDirUtilp->getDirDelimiter(); #ifdef LL_FMODSTUDIO - icon_width = 89; + // 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; + texture_start_x++; loadLogo(temp_str + "fmod_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 + pad_y + icon_height, texture_start_x + icon_width, texture_start_y + pad_y), default_clip, default_clip); - texture_start_x += icon_width + default_pad; + texture_start_x += icon_width + default_pad + 1; #endif - - icon_width = 100; + // 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 = 103; + icon_height = 34; loadLogo(temp_str + "havok_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 - 1), default_clip, default_clip); diff --git a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png Binary files differindex 5da146bfa9..5a50e0ad34 100644 --- a/indra/newview/skins/default/textures/3p_icons/fmod_logo.png +++ b/indra/newview/skins/default/textures/3p_icons/fmod_logo.png diff --git a/indra/newview/skins/default/textures/3p_icons/havok_logo.png b/indra/newview/skins/default/textures/3p_icons/havok_logo.png Binary files differindex 1b51e23ca0..ff1ea3a72e 100644 --- a/indra/newview/skins/default/textures/3p_icons/havok_logo.png +++ b/indra/newview/skins/default/textures/3p_icons/havok_logo.png |
