From 2e238f0ba85f290582cf900a9e2f76eeb8528280 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 28 May 2020 17:17:54 +0300 Subject: [PATCH] SL-12665 Readjusted all logos --- indra/newview/llprogressview.cpp | 17 +++++++++-------- .../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 index 6bbd050eae4dbe934a40e0b47ad90178429b7a0f..6f20e87b7ae817116bad7d2939b545cea3029c3e 100644 GIT binary patch literal 2331 zcmV+$3FP*PP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2(U>+K~#8N?OS<> zPF)y3V@9G+GGCG}YWT+#HByL1wk-K$vX-s*M`$ub$QqF)Ax2*)$udHgY!kBYQT8RI zvF}XyjAd;1dwxIjyxqC(ecyZE_oesiyT3ZlJASkMph%k{%kPLTHea=(B7u~o?7G?DXaEfcC0yf?p#cz-@bh_ zt5>f!vu4dQFJHc-%+A;6`}gmgNs}g-9Xocg>;|;8X3ZKibLLF*;>8P3-D>BvXV1)x z88b|Aaj|D-EBEQsr)JBREoSuS(WZU-_9iDM$8_k>!4wu2QjWINpO>jxGiT25ThT7cfgwf|N&>!A=B|(qV}9et4OnfB7%{>UBPer1xuvD0`}Wa&vPn zak8~w!2)Z_lqptrc6Q|5kt0XQcYd>$uV24TUd@^{Eg4XhsZPzGJb4mn@7AqblzH`` z4N7<~siAL&*)eY1I4Zq!=MKxx&d~C@b?eAGeE2ZSUc779u8}uy-aM9_(2vp&9yV;4 zB}*1%Zm6iJum%nsNUqEd%IqDZdSy0{)4FwQKBJx;A3uJi?cg9?x^#(hukYBsdpCKq z3a|{QUgR>f_{3`ks z%Eh}06DE**;J^XObY&?iDWM!QI3U!J;0{y6%F4>9JTEVgqY$tg4e01yym&Fo_6|@e z*N?-Ld;0Wga#yWd#j?EvRmbw>%gK@bf@L?3F4q_U060z?wTw<5Ja{nq_wL=J%*j<9 z_GRzk!-tgJy?dACtgNh`mP;Q{MRZu8C=r{aR5F>FnP$n7C1%&IT}IYozJnaljZ~Hr z=AAotX0Gq!g|^$gd2`dEMGLcXeb7P88gPbe*HQ!8Ub-8^Ff0KnHn`}L_*p`AqF!?=ncqT${cO$ zh~2kuA9Lk6p?1J#pn7$GzbN550NI@s8gCWX<~*CA8w{jofr>C2~efzR}@#01101op2W(INBt_3JZtgANARgg^r~JhI1|i4!N% zff(38LVY4i0w0_K-E?)6mt~OUPMtbg;z;Ywn>Q?ram?MIZ3H=o0otYv6xKs1jc^;! zu{L*=%Su4L?7=Jp&Ok!Tvb0$}dh{S)988(BedXeO2%bc<*7N7jDMKBJtSQHF0&wbz z0#y|MO$VR`OBhWfst{!-frfjurLUF@F4b){&*F zQsNH1=9)HbTBW2a^gD4`(63)Va`geD_5>q9Xoc6w1H;{XgCN|)~#DNek0&)Tiem=I?OQVpwax@yLXm^ z`s5uuc8oF~PE!IMhCg#Flm>7V$KNGpND2&W_}jK^V_2P=n`>INYQ+sWRz#$nM~@!y z=L!6*A)QnCHafH}ej33h58%9mn+89+0p%g=#?eHa#~Tpbmei?J$7E$?@n!{f)v8s? zvt2}*n>TMZWo2b1FE5YB4sk@4ql1=ZR-2NN5(Y2*`}g;A4upfD6la8{NpYAHemg8t zxakS1+u5;R@XG_dY>2a8syHmJu-*+Y1|JoVQTDn)06khaUfp_b(l!*%c4Ik9`O$2! z+lxFNB+X$k1|Jo)!+>Pejki8vZ$lBZUFFB(`sH~cX$}kVdti51d~-C!Zv`A?cNCt( zlzIu^GaRO~jDKt&rj$$SA4KqJ2hOi2n>Q!*s0-k>ZfETXKI~4DqXB%)jw)#n6oU+wTAX002ovPDHLkV1l*f BXaxWO literal 1740 zcmds$`8Sjc7{}jo$Ji#+gmLJqISh^ySuRt^HZiucotaybZ7fL&CuQp-%q?*X5mOW< zbZt=#QkEI6-H1jLV;Lb!67Jxg_kHjDaQ}+?J?Hy;&Uw!Fr{_H1d*|F8F>>m1003af zP7aY+OJz4X_Q43Z!X~BLhNdp0t4ATi1JOmH@E- z_BmH?5`w^Du^19VFoIN8R)QdiMx*8A8q@*Otef;>* z%F3#@w^u_$1A<@`6%`x~CoeDG)zzh=qtn#Xq^zvm(9j?&D|_e89S;wW&dyF4g4^5M z2?TQK?QJX;d-(9-Lx&C>IB-B(S{j4FEG#UHjEoEo4Rv>S zZ)|Mr?d@r6YrlK<&eheG&1M@J87(d@^7(ud6BAWc)#2e`fk5!`otF@(TEp-@Xp>&A^6!NI{xOG_{W+1S`vSXkKF+Lo7> zJ3Bk??(Tm2^a(~_V`F1=b@kHH(y6JbH*el-ZEf**ywTCog9i^ z7k@i85tS1 zwY4rTE+7J}uB@_HEa99mGcyxGpy}!9l9H0opFekWbgZqd)z#JY_4ScRq_(!U#Kgqh z+}y#z!HS9sMMXtROUu;M)R~zX2!S3xeCX-vdH($Q!otF|v@{r&93DatMDnP09BQBh zIeY^S;J?F;Z$@3n3R8Uf)go|Lc$S<}$2ilw>Thoo)A1LKa$}afrNAyy3?f{nfWP_Vj&$)<&A(T)r z+YOU1B%Lrs;D^zk&5A>OJ$yOrC_^`It%XumyL z6Ks^0dNR5#m0Yq}tyJq`X{=aP*YlpW!j*C6;M9A$E3M{b*cJ0`(215|{HQOdhAp7d z6V;jCs_T+6ez!v1ZJKto;k)tCjwxydjI|cUl|-~g=IG;Qo@1IYR{3q|#8cml(!fiL z)hfgeapm*nQ)z%&X9l2{pG=8B<6Cg6>E#y#2T+Cwenq(f*sgL98)|hY4*hJxwj^>b zI|}uB5Z1)6F)B?>%D!Fm)&0(Hs5EFYey)*4e+j-IUs#e};6Iz1ehsS$zN>D?{wSh5 z#n#r9AE93Fuyka_5S4FI#((xaXz;1(Cd%E8h&_F47?;Zt*v^zyJpSq))GS>o|2!h; z2kpqEcWR-}Ow(m`$f@$|{%zx$eWZP9_AE^64JjI%cNHrX-xa$9R7*hPPbQsVsP{%ffz8?RNP+Ydt)1vBfavtW?hj=?K%KuS6DmgL`4#4^F>Oy(y3%i^!rq73xrm zT*5+nDUBPCh=hQk0snpXF60=PWv7%EV?!*D?y~F|DqjfIe5T$nJNN>#G4rq(&CaP% z!pT3QF7-@a3OCz4)YE>reK^I&rhU$&puz5%uW0jEjgQ?Lh5;S*S#e(V*2zG$Fzi&$ zNF$rqpl?p$Cd~5-h=2W4?78~QN7redH+ug5tI^BhESi+d)jtTxx~q|>7?1*njkewn TVP2e-)Eyv`+#PD{{8Rn~(n{wr