From bf5ee32838b9d4c53ff1ab709e2935d8d0b4ec0b Mon Sep 17 00:00:00 2001 From: maxim_productengine <mnikolenko@productengine.com> Date: Fri, 8 Nov 2019 16:47:11 +0200 Subject: [PATCH] SL-12186 WIP Add new icons --- .../default/textures/icons/Presets_Icon.png | Bin 0 -> 1293 bytes .../newview/skins/default/textures/textures.xml | 2 ++ .../skins/default/textures/windows/Icon_Gear.png | Bin 0 -> 6229 bytes .../skins/default/xui/en/panel_status_bar.xml | 10 +++++----- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon.png create mode 100644 indra/newview/skins/default/textures/windows/Icon_Gear.png diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon.png b/indra/newview/skins/default/textures/icons/Presets_Icon.png new file mode 100644 index 0000000000000000000000000000000000000000..503ee892a55da5add034fe7055a8baf72ce64cc5 GIT binary patch literal 1293 zcmbVLTTCNW7#@lu*_34CgK>>6lOZk@wsY$a+fJxmn4wZbu_<L2H5#U!({`55#hIxs zx5PCu8+}?AiZ4F!L{@Et#NY#xxRRKxJ^+CP#1JllKp@=r$z&5e?NZhU>x1WE&VNq6 z@B6?1KmU9lXnm{V!YdaL1gY>f^Fg>@%*ExU@cR|G{1V(QnN1yLn;JD!f)0=dQ4Iss zCkrtU1cKQ8(Qlw0K}xSkp$@ad-@-;z85eRGJS}UGjUe@&v?fHlfQg1dOj6v~;ZHwf zs3f|vTa2IdYaED6%{@A3>uC)|db%Pm5%au>)~8u0AOllC({e&F*t8qV>#{J;T@x6Z zhnQV%?5U{^e*ooF9iR+eXOB=6g<f~z6ytQz%vF>oDTW|j1V!3Oils=FCegEn!ECx1 zWrMu;EEhbvvAAh!EJ37FDLm!CRXs*fE|-fSX@aKh5MejE6;nvt6{D)4zyl+qOPVRE z3Yt?C!fMiVW6<f-5@hXMRx!@n1RF-A1&yF^GFMUo==c9ORF==th8YCU{Qj%35$e_e z5d?;s)FbfWqE)$68q4WGFjYOIs)<4u198<<jkv0z9GCAJYP%&VqM9<^$aDOD)~6Vz zphSR=cVkcmmn4y8XwJ!Tj%!}8w~nHkTrQ61c<Ne1BV9++q=PSTc{P%hfnpZ8;xjH& zl$#p|S%aB*pi3VE(W|R6nlGD`ihH4p>YZ`L;$9p@xdb#r<R14Qk6pNe6O;?jM;9K> zhaV_#;&nLM@pSeS{ubW_T0%`bJ3A*QCzF$t<KyFYyZzwcU}R)uWo2b~c{!WS4h{|; z9v<%Q?)LZhZ*Om(o}NxjOk^?{o6S~JQ!_R;Ha9otbUJ%`duL~7M@L87+uJubHda?x z*Voq*iNxaK;`H>iq9{W{LwkFB)z#H~eSOJfa%yU7b8|Bg2+YjPEG#U{&(9wn9W5;_ z9UmXBt*zD8)_Oc10KnGP*1*8P@bK{d{(fa;<z0O48)(~Q23y;plmE34HVbY*kvl%V zA(Z|zd~ahd%G@ovd5I}|tqjN8ocA)(&e)GPEQu}atCmNWuj{SWmPZzB!g|GKxxZ}f zdGOxLWJQL&URv^c0|~+pJFos8vpo0Y33~sX_rLt5@v~nqKDhZoNptxR<?oW8n76-p weB1W;+qduhftFDAe(&WnueZAjeF1%leCV%w@voD~=b;(I*VM{?-`M%--|qME^8f$< literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 40f1d8b88fe..b086f7dfa87 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -206,6 +206,7 @@ with the same filename but different name <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" /> + <texture name="Presets_Icon" file_name="icons/Presets_Icon.png" preload="true" /> <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" /> <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" /> <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" /> @@ -256,6 +257,7 @@ with the same filename but different name <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" /> <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" /> <texture name="Icon_Gear_Press" file_name="windows/Icon_Gear_Press.png" preload="false" /> + <texture name="Icon_Gear" file_name="windows/Icon_Gear.png" preload="false" /> <texture name="Icon_Help_Foreground" file_name="windows/Icon_Help_Foreground.png" preload="true" /> <texture name="Icon_Help_Press" file_name="windows/Icon_Help_Press.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear.png b/indra/newview/skins/default/textures/windows/Icon_Gear.png new file mode 100644 index 0000000000000000000000000000000000000000..e1e89b8f32dfd9c70f89d25776a587d1726871b5 GIT binary patch literal 6229 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 literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index ffcfc3ae91e..ada980cda19 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -148,19 +148,19 @@ <icon follows="right|top" height="16" - image_name="Cam_Avatar_Off" + image_name="Cam_FreeCam_Off" left_pad="8" top="2" name="presets_icon_camera" width="18" /> <icon follows="right|top" - height="16" - image_name="Presets_Icon_Graphic" + height="13" + image_name="Presets_Icon" left_pad="8" - top="2" + top="4" name="presets_icon_graphic" - width="18" /> + width="16" /> <button follows="right|top" height="16" -- GitLab