From 32f16633c77564d567ed0752e56eb38abb916ccd Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 11 Jan 2018 18:35:35 -0500
Subject: [PATCH] STORM-2145 A few small changes

---
 .../textures/icons/Presets_Icon_Camera.png    | Bin 1381 -> 0 bytes
 .../skins/default/textures/textures.xml       |   3 +-
 .../skins/default/xui/en/floater_camera.xml   |  29 +++++-------------
 .../skins/default/xui/en/panel_status_bar.xml |   2 +-
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png

diff --git a/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png b/indra/newview/skins/default/textures/icons/Presets_Icon_Camera.png
deleted file mode 100644
index 8cb51cdc8e25e48f4d12e7cfd569e3f0daa5d04a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1381
zcmV-r1)BPaP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-&l2^BCdNZDQ*000F9Nkl<ZSi{|yO>9(E7>1uaGyS16
zol^d(D5&uVNhD~%*cjX#-0-7D5kp7}CK@9qcw%BOEHohoiIEc{>Q;;zgRWE-CMP6@
z1d+-{qPC(nQlKid(3X~VI?lN0d+XQPKo{M3lgXWX?m6FizxVxq&V~Qo<>R!bC(|^(
z3fKj70ChkkFa}%(nt*k{R-ljIX2iQMu4B$;(=nNwLS2g5$3~z+a3w?QBf!Uc?gCB&
zC9%*5oFKSeKo34P65QzYB=B*bs67n)15|-w0D{|%kDn9V<M_B4IHXnMKtJ#cP!DVX
z<^k&n?w#uakTD)U2;4_-FA&^Lf_stRb_3n`xCi)NYqkL+`u{V~D+YRjtpwKztQU*5
z@?>j+HPJ&J_y+hE_#J2fnt{9w_Y&Med|U!_0_WxZV&IJIi~)IqTY--W@H#LmCkHeq
z0os8a!98pNYy-LouHza3_8PDmxI;!uKw0$92D*VA1b5^bcHRcwAh_N%2%8i<_W~aQ
zeKI~Ejh6yhV6|8&0WFG^MDdaZmH}_#<ByUh56lu<J-}juTMwKB<^Yob>O@xp+zQ+Y
zRDi3>l&TD-SG^=VA>%87Ra$>HaF3Zg1`GlZnb;W>_{lUZ>;JIQYZ1^Y{l=%HD|`Yx
zM{q+mv=)J#zz%snE}(mXjlf(ni{6h|09j3L(8eQ^DLC<*dVfE`9mmJD`1qK{TY;m%
zrv$f0HDWt(7jQGdRq*j^;E49YIHok5xMxJmdFgdoNK>>cwfR?~|5@NEQT_yQ93M9k
z+#$Wc3AkPM*GP&^BVok?D4T%lRZz}WDh>c265J2?xDi;ZHH})cKv^*cyo`@+z&^##
zDSYez-qo{>jjRP=ulYbxaZo3;X%Bc+0hE^6S;~ewIne+-LvU4rI0f8hq`Y7@Pb`2+
zN{NDHu8dYxXpZCK0zF@<DdkmxY!moRde<RG3ML!+%zh;cASYBgjTJRMpxhqU26N22
ztHzrqldgG<Hw#!<;~6o8Hcx6LNaS@v#Rt*b2i&N!Vc?>utk;~XHpv4wD0tHtNzA;n
z26QsD8BJ(fmd6!&ns&Qcz#4)(1AM2ktc<0_E2sNe(<$5KOrma?H2`uc8<`rktwL;j
z`2es*4dyK^9MgE6Y26cmgWHdf3l$5aYHlrJFfp=CNyD_3kC}K#-#4ijyiaglz|*P~
zO)@?x!-s+8YP0(#*Fs5iL0Prb1mTnuQJMuA(YRP_<YZvNkdJ!_?iJtxd|VBzke89*
zE^6}+)G^ckQV;`w7{|(K7UYZs09Q<YSLIn=<1N5;e0)+>@aSaw_OTfsHvk8eEmqnz
zNLztljl+51Le6Y>MT^tiu9`zc!7MzZ%C-m}`{h-mJnmPP%r%86(VPb078CSMwRIrX
zWx1lY-!L)+oKuV}la?86G$PMVrVR%8P2;Cc;VMeXv<?)l1SQq}KY=Z#Cd^ZB=ojLm
zHmU0Ui1NOmUs+>qYG^H*Uo>k`|LC*;jse>UZlB5HnY`M8_a-V*`aR&|mpZj{i;+C=
zx7cWr&IMBmi;|&DDc7v@yd=$+NY+8)`Fz<tKyU}`q4ZJUdFek#Mp6k96`PXo88KIH
zJQ_CViGqTx&YZML0#lZpKLIZhTvsyXi|D_j)k2|dFdn9zvPJBq&8tW8aY<3$BQWR8
n8Spaj7cfL{gERicJDuxaz@?sv<fn`<00000NkvXXu0mjfX8LEt

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index de9ed4d479..bc2abd0c02 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -98,7 +98,7 @@ with the same filename but different name
   <texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="0" scale.top="1" scale.right="0" scale.bottom="0"  />
   <texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0"  />
 
-  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="false" />
+  <texture name="Cam_Avatar_Off" file_name="bottomtray/Cam_Avatar_Off.png" preload="true" />
   <texture name="Cam_FreeCam_Off" file_name="bottomtray/Cam_FreeCam_Off.png" preload="false" />
   <texture name="Cam_Orbit_Off" file_name="bottomtray/Cam_Orbit_Off.png" preload="false" />
   <texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" />
@@ -206,7 +206,6 @@ with the same filename but different name
   <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
 
   <texture name="Presets_Icon_Graphic" file_name="icons/Presets_Icon_Graphic.png" preload="true" />
-  <texture name="Presets_Icon_Camera" file_name="icons/Presets_Icon_Camera.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" />
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 4eec922915..fdd27b35c2 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -250,18 +250,15 @@
      name="buttons"
      width="226">
         <button
-         height="23"
-         label=""
+         name="open_prefs_btn"
+         image_overlay="Icon_Gear_Foreground"
+         tool_tip = "Open view preferences"
          layout="topleft"
          left="70"
-         is_toggle="true"
-         image_overlay="Cam_Avatar_Off"
-         image_selected="PushButton_Selected_Press"
-         name="presets_btn"
-         tab_stop="false"
-         tool_tip="Preset Views"
-         top="13" 
-         width="25">
+         height="23"
+         width="28">
+           <button.commit_callback
+             function="Presets.GoViewPrefs" />
         </button>
         <button
          height="23"
@@ -288,17 +285,5 @@
          tool_tip="Camera modes"
          width="25">
         </button>
-
-	<button
-		name="open_prefs_btn"
-		image_overlay="Icon_Gear_Foreground"
-		tool_tip = "Open view preferences"
-		left_pad="45"
-		height="22"
-		width="28">
-	  <button.commit_callback
-		  function="Presets.GoViewPrefs" />
-	</button>
-
     </panel>
 </floater>
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 c6a42ea612..299f019145 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -108,7 +108,7 @@
     <icon
      follows="right|top"
      height="16"
-     image_name="Presets_Icon_Camera"
+     image_name="Cam_Avatar_Off"
      left_pad="8"
      top="2"
      name="presets_icon_camera"