From 446253df44dd82a7c5e711b9a69369cbbeb2acb7 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 10 Mar 2021 17:54:44 +0200
Subject: [PATCH] SL-14901 Updated button according to new spec

---
 indra/newview/llfavoritesbar.cpp              |   2 +-
 .../default/textures/navbar/Landmarks.png     | Bin 0 -> 15870 bytes
 .../skins/default/textures/textures.xml       |   4 +++-
 .../default/xui/en/panel_navigation_bar.xml   |  21 +++++++++---------
 4 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/navbar/Landmarks.png

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 3bebe6fc59..2394a763ee 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -838,7 +838,7 @@ void LLFavoritesBarCtrl::updateButtons()
 		int j = first_changed_item_index;
 		for (; j < mItems.size(); j++)
 		{
-			last_new_button = createButton(mItems[j], button_params, j == 0? last_right_edge + 4 : last_right_edge);
+			last_new_button = createButton(mItems[j], button_params, last_right_edge);
 			if (!last_new_button)
 			{
 				break;
diff --git a/indra/newview/skins/default/textures/navbar/Landmarks.png b/indra/newview/skins/default/textures/navbar/Landmarks.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b35de913b26974ac8d191de8a0a28be451e63ac
GIT binary patch
literal 15870
zcmeI3ZEO_B8OIlzP}d<ODikQi<a#lb0(-lAZ}zRvN6x+jTkRQRjBN7~v$wZruesYj
zcGvjq4<XQ|ZlXfKZW2l{6@d^@rB1|4+_aP+C_*L$tD>!12y&eSrP#u_LB=6eO=s`j
zW8Z{I`A}7}l70KkGtYl^elyRr^JSl}tXTPI?z~)rARa9*^HhP~8Twz&H1Pk4GV+h$
z=WCI&I+Y+EnW_IxA@=Q`OAtlnVs))n>-#>-%V852ko|%w8jgV81mRpBjd1*CK{NP;
z22m<D-u~^oMuQkAHrCjDv@cRBG>T<yim;}wqMC2p%sT?c<*r<3lm!A|LE{Y3a7a?w
zXt6P-%Yu8onKBw;U9`=`Mz=noq1IPvD3uk#U^CfBo;EXv0*8sQSse_s%wVP&3&qfs
z*+DW4Yb{_IyCHEIUAf@SsRV*-m1jj_IA9eU8#OJ$QdCPzi>bw8l9dLEaX1_lZKlj-
z67(R|R!QTcq@+F>7fI@P1eI6Bh$hOCLD%K{a<f)!H0lGTuEe~;k<>tvnqUVgQc*5K
zF(#VI66Eut!@}W7BUP<RNY8B20oCf(h(J{ds@$yb0_gtaWRIX~-mPFt2}BPd<lQPr
z+N4qeKBW_BRzfk*0iF^<LKuXofC4k=Tq2FKCaaBd7Jw;tR*ae$%)&zVWDOIdVwN!7
z6Az2+srXVm!A53F6@k-arCOFluK0GXOg_D#wA8S;Mw9|_i~3zB1@}(xnY57L;WWWz
zrp+`-J4myo8tiGt%3A5Aw1uVV43T(GNW&)w#9(VugCS`P$<WnI0Sltd=B2bbrIFDS
z)&Mye;56=mR5JUH*YWw-a!J)Vi5JQ}E--hKC<fR<t3AN*4l8L7(tgrjV6~B40mqRJ
zzm=wKR?gus5Mq-YA3j0aBlFGr9!f|DfVAE2wmK{&Zm+{y!Z2RC#8FsUNPFD&La)bL
zXkn7F8KDzp1x4H{1Xd_=IF{ZKPEiFtYl@A@v`N*2#2$#{9V<?ps>N-!lrR=^_UD-p
zntmQ2?u@$wS!Y`KMamhWY2_4#^i-iO4bZPrL{QPWPzEb~1^*k&lSpJd1W*IRl!+=x
zoz{%;^?B=cb&arPd~4DX5+873Qp*FX8O!l{#dfJ2SX?I+t8mG-^h3oX^nv0XCRtN6
zZxv{p-$q*ee2}yjT7#tD4|cN+*cJ!F1qF*Osh<&^eT<eyLDJJbTdKyNB-Sgth$;uQ
z7ETe|4Im@Fpa{hU$46vW<{LSwK?u00<fM`faEO!AS1ly|FD}}H)tm`y4o@+?G5)_7
zExwfF6EImcCMK*iz_USF33HlD408<v6_Fa8RJt)u(V2Q}v!!xKR=^uba9NzxWX%~-
z`U_jHM__Anu_OkCd_o)CzgDl-q2^fs0y7ORa6|-GA~e$tht{D(Gu?1#I&!TfYA$nP
zG^jZvN<US^VXOfsX~AW;+4TAWH^UK?VpIs#dPML7RQ0mPSQ9a@W75F7Y=Ie$L|}X?
zWSn_p=^bwcCu(q*r&6c+37MZNr(fnxdPZNSDx`%6fq<Y*j0?>N@?u;N5VVPLq4_{w
zj0*ySHZd+VAIOVwK|s(Z#)aksc`+^s2-?KB(0m{-#svXEn-~|G59GzTARuTH<3jU+
zycib*1Z`qmXg-h^<AQ*oO^gf82l8TE5D>J9aiRG@UW^L@f;KTOG#|)|aX~=PCdP&4
z19>qn2ngE5xX^qcFUAD{L7NyCnh)f~xF8^C6XQbjfxH+O1O#njTxdR!7vq9}piPVm
z%?I*gTo4eniE*L%KwgXs0)jR%E;Jv=i*Z3f&?XXBZu<LJK>{Dewt%l+Z+zqMLh$9R
zfiJ7_5kwoffA$9iaqn~Rdy^oVX@VHsL=fy=f|w(B)Sq8L5L2mgkGnd0Rom0|z0NK3
zFZB0c2p5;_2r<{s=I!4e-Yy2nX{}8|hi7TGpBS0#ZZ~vr?WP@Fug+dD_14R?D%>42
z+{a2Qj@t4D|J1Pb_=US4-W#}cs%UW&Q$ON5{prZS!m_D^)mO@PNx%B(dykpM?tb>w
z&+gyew)f}jrGK{NNj=vTw(CUrTf|$td!ITx<?Zmf8_MX3ho{!O-P5yh?b^PaGt>`r
zIznf+{g|Kg;R~<k6Q?c*kH3C$9l7W|<=Q6~FZR^*esq85&YeA%E?ugB?(t8Ly+!PP
zsJG}h-K!RM_Fi~r!|-d}L(YmtovXXO#us<ox<w9D=H!ogy{n)81Gr2ixpVi4y7q#Z
zGjHzNL=TVM+mJuDZA1O~JBN=PnYZMIGX2@7^14?T=LmIo|FLfxasPt@!q5KPG}?DS
z7|72rKQ@0x`;z?L!dYM0erDaW1$_l}`|MR;U;5I;7T*=uCx+)ABA$8ob9LElb(zU@
z`S$SeUk0Nm8x9>B(>B&zU(mNF=kHxtZtfo%9BkTq;J`Ec`aXWecjb+_KU)1TUBtNl
zJ+kuXM=uHQTwip4dES&W)=TR<@~{8({r9VXG5xVezU>(rJ?*No&O15%+}_`P^Tp-;
zSFfIZv#aaeuJ-jCH;x95|7~&a{PH7JM@J7HJa~=g`JDEW!l65P&Cb&v<CdmKWW?0l
zpI^6l*4E3-+E0kNzkYm1{ou`E>6hPWd*S>Cua_L$wC9aI|0-ABtX^`ov$ONg$3;cg
h)}4BK_wW0s5G&V7^#g}?y{3PmUGA;$beC+}@gKe+ng;*?

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8d609afeae..03878d9fe7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -339,7 +339,9 @@ with the same filename but different name
   <texture name="Inv_VersionFolderOpen" file_name="icons/Inv_VersionFolderOpen.png" preload="false" />
 
   <texture name="Inv_Toolbar_SearchVisibility" file_name="icons/Inv_Toolbar_SearchVisibility.png" preload="false" />
-  
+
+  <texture name="Landmarks_overlay" file_name="navbar/Landmarks.png" preload="false" />
+
   <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
   <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
 
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 4cc05fedc9..d3448ed0ba 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -151,32 +151,31 @@
 	         layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="242"
+           min_width="254"
            name="favorites_layout_panel"
-           width="320">
+           width="342">
            <icon
              follows="top|left"
              height="25"
              image_name="ChatBarHandle"
              layout="topleft"
-             left="-323"
+             left="-345"
              name="resize_handle"
              top="4"
              width="5" />
            <button
-             height="16"
-             width="16"
+             height="23"
+             width="32"
              layout="topleft"
              mouse_opaque="true"
              follows="left|top"
              name="landmarks_btn"
              tool_tip="My Landmarks"
-             top="9"
-             left_pad="10"
-             image_selected="Icon_Gear"
-             image_pressed="Icon_Gear"
-             image_unselected="Icon_Gear"
-             is_toggle="true">
+             top_delta="1"
+             left_pad="8"
+             scale_image="false"
+             image_overlay="Landmarks_overlay"
+             image_hover_unselected="PushButton_Over">
            </button>
            <favorites_bar
              follows="left|right|top"