From fcbad172a68f12169f1e6ab0390f71be10b900fb Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Fri, 6 Nov 2009 18:57:35 -0800
Subject: [PATCH] Added camera preset art and attached to camera controls
---
.../bottomtray/Cam_Preset_Back_Off.png | Bin 0 -> 700 bytes
.../bottomtray/Cam_Preset_Back_On.png | Bin 0 -> 754 bytes
.../bottomtray/Cam_Preset_Eye_Off.png | Bin 0 -> 914 bytes
.../bottomtray/Cam_Preset_Front_Off.png | Bin 0 -> 959 bytes
.../bottomtray/Cam_Preset_Front_On.png | Bin 0 -> 1087 bytes
.../bottomtray/Cam_Preset_Side_Off.png | Bin 0 -> 945 bytes
.../bottomtray/Cam_Preset_Side_On.png | Bin 0 -> 1049 bytes
.../default/textures/icons/Inv_Alpha.png | Bin 253 -> 319 bytes
.../default/textures/icons/Inv_Tattoo.png | Bin 253 -> 416 bytes
.../skins/default/textures/textures.xml | 15 ++++--
.../skins/default/xui/en/floater_camera.xml | 46 +++++++++---------
11 files changed, 33 insertions(+), 28 deletions(-)
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
create mode 100644 indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cfe2e850e614f131b343dec26aa23b3542720c0
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!UP(kjRCwC#m^*LcKoEe}2Es$a5+KA8
zFa@H)PD`X*pHuz-lvGKdQ+~iD*WV?*LqnHHX=zeY<o>{=prC-`)tNT}3^&7Zr(7Pg
z&yU5YWTcU8?d<y7*_qk3ndNf1MF`<Q@oFcTg7z2yd<Qoyv8OCp8^fWnc82>!_y%ZD
zoMsGCDwTvzr*rW8+2L^XGMUU(I-Twt9UHTF+sFWtB%M#E)7*1ye!u@yKA*qb*b)~C
zh0~YdQ2PD;S+Q6=+z22p>tr%HQnN$Ia=9F*4%lk7a$0RGmC7M?!1;W>V}<SOse@jx
zm(yzNcDv(^Mnj+mSglsGJkN_-?SsJ}KO7EEr~xh(3qBf+5~ovJoeu;8*ylYpKq$c1
zcvcex^;N@3gu`LHO4I-&k;o75;4bV!$7;5TMB)x6w4X|)zHVZx`&O&f_;$NZn$6~4
z4WUqo#9}d$OeXPhAM~C!U>5X3qwROl57d?zwy*49F!-#+R#6nR7rWi=`FK2zTk1h5
z6$0!E=rvK6<<-kQ9?vQf9%nRUErEjsf&F^b=JWZ8%jN2^Ec*pw^3rs`HQdem3-AvF
zLe6Hh7c&@@ee`9)Fw8Z_aUV?s#H9gm+&+Xed=O<A2_R2Ri9vw7FcS_19CHM5yk{72
zJ;)xhKp;HM3<JU-C&W4t)x5~6#hz8(dyr^3-GGp_mcp%L@jy2qbQX#A!eI&13%El8
z5Z}Y=O_C>DQ@vg{1oK>fh(l2?;FFn+Mk7Oj|JwiU=aJTWXxYD+*W$td8&I(^pMrog
imLeO%A(Q-5fB^vYSp_L!SU`IK0000<MNUMnLSTY!?m=h(
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb5d85e4100c3865a7c0f0afa1f49e622defa49d
GIT binary patch
literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!lu1NERCwC#nBQyDP!z{cZjvr-m%6&u
zE}2SokTMV-wl_i8AJF<L+aI8hg7bY9AAFkNqdp9L+3?kZuj<QuQjmeL$!O>N(Tdup
zKk}n#Q}3NRR_$z-G-+fz5NMKf&;9g!?mZ`5s@-n$05E~CF!;;r`1(j;z>D|?3;r|%
z`52BEi@@i04CvIDegxTAdn$d&y`BAiPcv+F>hhIrR6JL68k_9m87BdrE#FzxYI3^U
zyA$y<OP8+RSRGi3Up%^d^B_24a&c#2?eYD&fdG=UD)P7aUVa4f{rXG6bHKv8Hz}*W
zx!2F<JO?y1CFzFm(W!$0F34N1Wo$rDih0R1z)EgCbxKTFo-i^pChDc)HO~OerXj|J
zv!ozf1B{M=*=o*s2FQ(yS)i!u`KjrizT{6tV*=2Dpsj*!tJQHQ$3N3Up|mWQNqfuu
z%Xd7Hd=-qHUJAt%n}cX|Prhz%h^4|deE+c3@q&+uFgh^_@yQG1mK1c)0aLxy+h?1<
zAiY_GO0Ax%)YJtlzO9xCrHU$*<?3QXZwRg`sB4;pC&}P3(x<WxMym~Bjs=#bA;8d`
zU}hUM-GI7gzz~CAB*Xy6qAE?(55xTMYTp3~oUZ8)$nx4NHyEOUAvMG7Ud$N^I1Gmn
z)j26bSw6zw?i(OUji#zA`{5k7FoafyBmBL-tU;_^rk`*>)i>u=MV)pGNP;;1>ORPt
zhH=X=AP#cftuGa_*?OsndaXUT)Y}uF*-YC8#Ok>Ux2vLQ&e{gV3t0m9jVC3{79dV<
z(gQ%!Z3Mf3e+}H)DL8`ZHXdgxX?GWke?F+Inj^r&jz2y;vbd8a*Un~+go6J)py6Y_
k-9z-ePaz3Y{)Yeq08Drm=&BNvuK)l507*qoM6N<$g1}p6IRF3v
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b509867805cdfb55be8c3a1f976ee94612bab9b
GIT binary patch
literal 914
zcmV;D18w|?P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#G)Y83RCwCVSj|ovQ53$6{3r>KC`M8l
z6CeV`C%_lL2WSlsQ1`XnlGY|{o4U72*VR5iyEP$pLtIHsG?D-&8a6s4iU`>A-5>!v
zg*(h0!bxuC@64I+o}anjxwfaLCnsafO9RJgk_HXUMgRkJqOj?dwlc-wAj&j@<6@U#
zq*AFQ8jZ$UyWLj%r>~TqPUlH57%Yry8#(x5oEL9zZ#~s&b*tHIZqlVXLcMIa+xHh2
z7x#QVU(IrW#bPn_@bIwPseU7(xm>Qdp-||TWdP64&URX@)|Q!+n3<W`TU}k<5vmd+
zhR@H>-<bsmfeqM_3b0fvB`M$D%c@S;f=y`v@9yrt$o_?h*c1YIadGilpi;*XwPV{H
zKnll(RX^fUwuJ!F57;t*qiic8#bNbwHtZXUKnQ|X1041ZMIZ#K)c}WmV=Oi^J39-b
ztX{7(kH<4q7tf&w{ZYDxmO7AutE;PT^gP+KM6p01z;d}9D-;Us{{Eh=tgNtfI?XOG
zFFBB2-R0$Fc6fNm^7%Z!x4yp4lF1}1m&;g9`qpS-Js-m1@PV)g2f;z`L3jb+ve_&j
zl;F^1s;Y8O&){(V`1shTdwhJ%z2B?b5iilTUA<z_1$cdZ9UKJL;dkBhxw$z$AjDAq
zdEN^Edh_%1-D`)#q3aZiz#AdLN>oZWX%QOCK9x#!?<Eomwy?0kLky2~$N;~FE<&2g
zWcYo&hi5t==0Z;K3FRPMP3z>3|4=37^?I4x?dIpChkWgV)6;z}j#{n8G)>b5$HCZa
zN3mG!l~9qKo}T_0gOHjM3jN1OB=S|LNWgq2368vX;`jT%8)DQ5H6`vQ>8xQ`1q}TP
z!0GiX!jzvv{@Vh|rN!g%mr@8TW+}brwcGckF>17on6XTNRNed103ts`W^BNFpO==F
zDpI>TiC)w?w&b>*@S=?04{V6;Fc_v=*cCwIZKi2Ava>K2AH=Qz5d*_jjdw(M6ifkx
zM5EDdBc6mV-kI3$R_|&<#P!pVm8ML@Vw;HV(L}f3^!5m8S=<<C4St&08<YyrDnSmm
orWjuf0B_LwO(8g7y7?=>0Jg7&)rX?`xc~qF07*qoM6N<$f>8Fi$p8QV
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..9876aa456cf1282e74a459ba3ec0173a9c1fc75b
GIT binary patch
literal 959
zcmV;w13>(VP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#VM#<mRCwC#SW8bDQ53#|3ZgP-Fj^aD
zW8w?=10=XHX~NEp^%wX9NV{*F?%V!=wsz&pl%>**i5qRZaAPQ%s2d<ce1wNDK(ODr
zGGrXb*9?xc;3PM5=W_1MchC9GV-PMcFYSym5reK)k`hK<0KgZR*qAk?YO^pn5}TF5
zT_J1&G$^e`AF#N%=uIY*Z_DL!NL~{JA>Y>477Yf2@5aZ+3r3z#QT$Tx=13$GNT<_t
zc!sFWa9hIf_fJnuOe9TraXcP(WipvBU0q$G*Xv~i0|QqsX>H}By}g}Pt5qo$i_JX?
z2iMovLj+)Wc$kADkRu}_Y-nhR-^<rZrQ(~PpMPyS2Tx8;LOne_jD{?dB(aN&3sxu;
z_&NbRKR;*3$H&Ca1yd~u-no_F>L-SKmFqMo-DVzC3W8&>zrWu{fpDL6cXtyv1KZo%
zZ%pGLI5smjHYPqqS9UjoWd@herdW{j+oKb%AS6w5F;d6^g5eWh8he0x9tVoL-R`jI
zl_ZzTx%T$<{?-~^O|jeUVLH&WL@}&VI5;?n-jOR4$ct;HM==s_AfL~F-`w0xt*)-l
z?Ck7lS(mM>tVsCn59YrSShJ;4$@QczrWc%@o&CTxK=<fa7=c?_T4ElLhgT9>J3KsO
zySuxrudk0yO-)fy)%n=c(h^4f{?%}RaF-YE`l;lb%jM!P-`Ln-%gf8GSS;4{(Z#UI
z$w^*WuvZ<?Uqw;;&@g~C%UufwSc1V4bseg?sZ@&3dwY9{pUS*RosBwGy~hE+H3T5>
z4SFHvT1Q6*cjvWFFo1w{_)r~?;ec9o`&DOW=RZT0gaSehjsPgZp_}GGK~_Y?;I5}3
z>mb!=0t96~;xcUrAgnU0UUN7c9LVYEDF;RtqBW<}$?pkFHk;*5D*+{I6G+liNq`Ih
zs;ub(NZeCfujX>jE4g!qo0O5txk;eNvPVZpY=3{BAt-K8qGkZ9(fR-)Dnqx_Ro<mg
zpxjZfxm9Ir<Dj?ol>yy}8k>Du>tu<$z^R3F$=bJw1WF9*1?V@UDW&fgy`}EP$r6c#
zAuw9|!9(2uCG`SDt`T|c{)T;%Y;A2>`@fmd(NQDYeNWP`Hvipf0&Eb#iiPo22w;|S
hr3JwertE(K1_0Olhg?>2i@^W@002ovPDHLkV1n<MyWju-
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
new file mode 100644
index 0000000000000000000000000000000000000000..f481fed88cbcf322624217a3aa058806cb4846db
GIT binary patch
literal 1087
zcmV-F1i<@=P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#;Ymb6RCwC#Sj}r2M-+d%vmeraNLDH*
zw&J)}N@P@Ox7df0OA+J}NJ1b-C+CEo`w#dJsCo_cAJC9Pa<Ll<rC^t|bqjXECNx%S
zB9wS-WBEhc@6~Fzvs>gymh2>wy3xT8h8^C{oBhrE&3p592-kH*0632u54|NSZW{y!
zIF36s^rlqE9tP(LO+t^$DZoyJ>U4s&U!SC2J^SOXr7M}5jvz>x<;D5WuHMPU5=o_#
z`MoHfY}a_@$A=Tr^QEloI$}$D5GAF*xOs1Q?DA&d6z@wfgw5Qa(_vl|lj#YF4-ETy
zMA3d@LL4|%JMsMKT=u<CoLl@M;{h1HGzO7a9Qp@`ffJ+tJ5$&EzPw+A;#MK``{Vo9
zKfm?mT%Z7z-R+Fn7x%%{WZ=R_U{@-jDWyZurlI*`@$0!jDR!NzSP$-S#WdXj+Ut8`
zPxD~C7<*fTvG_pB3xqd`w+)6arY8^nUcMXH9yE5P8zZBiz7=gXx*f~7jvq6Dc#x!M
z>D`UU&A=#*B**3u%gqoZ%Dwq0AY{CtdG6fEbl@jRMJ)^E{OT<HSM;{7m-y(kx1jeD
z#WWvLiu<McV@qOPmoz%E6!=M^Yx)FE$Wz-=A+zwyQyBj^4VRM1hA{`FGW@)_m`JAO
zSx)Ga5JC?^;m|CiDCK{nxN6&irfS)m4b9L{SpN$ao;-s1nKSU=&=4>*1v|TY@J~Ju
zADkV8D>rZB_&~KOWSq#SIi6eSIzZDfQl?>k>!r4uPKb#3<0P!DF2Qd<eGist9F9+Y
zG69#bT=NSDO;L{oH2EF2{ibUGJ<q9%I$IA8Q3!ZJs9S&z+ZzSHAB&#_F&cY)Zp$*R
zY@CKUG38la6drU1pj;|{jmKr`bzz<Znr{5xavTR|6~b@zVp$d#n%*=o8)B!}P$<_?
z6ng=26dXYk4dARw6{MmJ>l^#9Rw%;up5p6j!Y~XrYM$FNt*<(cVlP^c>KK-VDyFQg
znoulhU{-A47zD8}g3Xc*s%F5>feIW;Lre@qglBz_7*JzHgxT{P5az<mZ2|Q5-cj#)
zvRBe!S2+L%ksz=L`Y`~KeC?vRKx4Wo&@2agQ-+OV8Tv&Q!gRA6ZQH(qAMF9eQJZO{
zM}!NBC<_!KPB?lA5JJdrcGU&Pb)gl{uH#I$y$A88PqosA@c;fv;F`RE$1>EhpGsir
z2ipRO=^YKCD8)3V+6CCOvh|l+9f4_OkC_^6H_arP3jm|DJGFPT@7h1fN-p2qcQfOu
zk+yB!V}h~cg7x%v>l9#@09JY!pMQy-?@^E*ru@GG3;=iXl9T09?yLX+002ovPDHLk
FV1l}u0!9D;
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..d58b4ff9904f774cad3344fecbf79b06e5350fb9
GIT binary patch
literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#Q%OWYRCwCVm^n`yVGxGL#@Hb68Y7N?
zVu=Q%VAD`I;Rjfu1rqlpav$IaBuWpVPb4ae5J8EQ^aQ1#B$DM0%q1=#oIdl;hrI#g
zH4ENrq!nxLw;#{W@y@Jm#bVJ(L=q1EYbDFzNZA1R3@3K7rWNcKhGVl^8BUl(tBuyy
z)&>s_4m^B5K0dy#)xMmAz4dIcva&LgN~OM>pP&2WO>MSRb93|8$;rt%Qvnwj7vCll
ziFu{#PN#Dz5{XRJm4r{dadmZduoj%qiA*NEu&^*~3gGeaaahf|%gf7%DS&}MV03tR
zm<9$0$mjDZu0sk*oTr9YF^a&4gS=j^`0RGO$>DI&_VzZNo}S)WdvbEZfa|8pOixeG
z&4z$vK=$m`))rk|T~R|rgYh9&GWH}JhrPG=Mj-O}ymbKCgJsCFH8nM*3<rc5Zz^32
z27@weOG^tMzYPV1zPTG48&%~cdvk1T%s3CCr42&cmRnm}{VLXqVu8&V0?2T=Ty7bs
zewWL|txR!kGMS`UEJi~^LzK;C!+U#s)4Bq3SW9qH`MdV^b_{Iyw>UaFqK%CW3WY-A
zGs_MHdj`<IcpqJK5PJ6cHXIwmEOHE^mH=h1?eFgk-J6)0pziK&y1u@qv$Hd5Yir|M
z{Mct6o`0|DG=rRbjwk<9QN<)l5~b5=Iy^iigiw6n)zwA){r$53#p7|}bl|S@e@wQ2
z#Djg)3=s3)C#<{E^bv01nNr&m=Y4&Ba>&_p49*Y2p03;y_XOd|v?e(SxX~&)C^U{k
z#~xxsG01ScySoCm3LKk+P)D>Zl6&I{=UJr|A`J*LBJJ$#lm)uhLx*(}>S#1t{T;DT
z5IO1bcx12EdT6A@Yr}gn7Y?^LRWH4T!ieF3k1>QfU@D+eD%>(_d(e=1kVpKBiwkoB
zp?R~+Qteu2XQ!Hq)fW(zIS1)@1>yZr35sdCu6GViLyZ3UgF(?f-aYj#&5#_#5c(6K
zZ=iP}gny}?6xOv!(8~TI{8MQ9FFQIqI8Prn+9PFV4Urj4Ch=09z9{AC=0gJ#uj7=_
z{pYt@uLqb1c?$C5e|So2ki@Z$s{gKL)Y27D%Oc5Jm@m(O2_7sg2**r`e*z2u8YWAi
T{GoM700000NkvXXu0mjfGUm5^
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e7389899218710977c298873d66ecfbff197989
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#yGcYrRCwCVn9ENSQ51*IJUWlg3kpSA
zg+S0s6i5)m!f1enF)^SE7Y5w9=wHCr2zy-{*(-752BHf$5{%IWL@_2>MIkM3=^Lh<
zX=l8*V3k67NIUIGCihNzbLX3LfA^kqhA>T20)Ug~5}>?n16>OQ0&GJa8<eN%WEsO@
zvyo8dMi*)#|Hn6;(CUJS`)yZmPZw%ltig`sOfd86*@d9rH>AcR?(C!l850~eqgU<>
zj+7Me{qsk?!NBZLzW+H<8SA-wZ}>QX|E<BVZ(n%!gTt1HNBSn8Jn)tTaDDzu@1YK}
z;A($K02@xXbT_wOhWazDaN<-`-f^aBNLZ(q?_!p>yU_)5Wp(D>E-66MHdyx0LM;4i
z$Jn(c|3%bHTk64FbGquG(&>Vejm?>R>{*7hXZj3Pf+fypc2UW+wRKGyXlz=#i~wny
zEen}_h`l0aIUqq&zI^|+boOLg3TcuN6cC(sQ<egzQz?;P_yfmP*VY3myP&h{nspvb
zCK8^_jm;54a(WIL8{bsH-Q145UP}NmTr!b-jKZUbWJMs@{5fto5{1t{=izK?2WWb_
zFR&8w78MXLD~3Z|>CbOWRUOviuCZ(D>+tTwN4RwLX6Ak+6o*tQ?TtmEPw_lONfu(!
z*nQJ5`gR^E0+0m2r^%PV5(b2$QCM7F0h4B->-sIIKH&y6sl)6-5Znq2G)16Hhj=Y1
z@?b#$wWQ`ssOs3xT}*%^%MgmHu)G$8@X`-pK!d6p7c_XzZFxOyz_-9Uhztob|2Jq+
z6!lP$#L<F<IxU&p74TKvgoXJv9Be@mcu2WCaK6zAB)O#;?76^d6h#qY2iz8T+KZNY
zjH2myK{RL>M)&SFGr?h}!Ck?E$ZhFR*YzyikHruwC`_mp_bhoNRZR>Oa+A1s0V2<E
zIVFv*Y49t&0p9~bs6<|K2>I(VBc1Lo+Ce?zo6GZ1yiqp6r7&5q?)TE@JngbP7T3rO
zF!bT3MPBT%9PlWHPLQ)D1<WUfe*nwdgO=ojv;Jk26eLOuNKzCoz!&%2icSacEK^!Q
zQ4&Yw3gre((?hwSJjbBWRXn8}sj5TC!8mHhUCyd56!Zs<``M&uWoJ|4sR`6f;QUb2
z^#0r|=Loh~)J?*2oKKRaVUFkf8fyfs(<7z!NHQaq95W2dEN$zw2kR6qzwe;*5|7)K
zOmRQI?N=V?da4^OzvrJUJciP-DURn3m1-3gu#m@$UdDWxkLYt{3W=HKehV-F{489X
TTcS`l00000NkvXXu0mjf9{=a6
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png
index e8d246c6faf0aeaa4b4ff49b8f28e79cf8c92d52..b65dc1929df4bb77e27d4cf15e82bd7d18b9c9ae 100644
GIT binary patch
delta 254
zcmV<a00IB~0lxx}Nq^x<L_t(|+G6<s|33pdK6B=bJ~3h-%m^Yt;OyD6`9P`wh!w6}
zxx%2Mqa$E!Z2S=_#}A}FK*b*b*%N?r6G3t;KuLX&01!Jcpn?NHxd1481CqD`NIg`p
zfN{l&74Lui_#wbRCSXxfQ32WBfGh}gDqc1eG%x{)1xNxPh<CIYrfvZ^5P|-&2XZca
z{P=Oh<HwI32<hhF;0OS^`~xr`55i*s8ru6ofl0^<K#hzrJxmM~0v2Qr&<hMeFTia>
z4pd||&;<-wUBJ)J4|gtz#>GYkqh4TOKuHJW0Du4k07w+44R{J`s{jB107*qoM6N<$
Eg7b-EjsO4v
delta 188
zcmV;t07L)30{sDyNq?V7L_t(|+G6<s|33o;e*aLPC@~;r1QB5H;ZZ)2EC6B!hya5C
zgMi#es2o3tgo-}^;t4>xi69Om$Yihp1A_wtD!2f|0Z{e^AT~ggKLD~2WWal{ZRCLu
zOi<g&1rtCnkcaw<0qRdeu0d9#zyu78hfx0uK>bY!T!5-|05$1lfrPi*L1<_b=Ws~u
qfb}pjPzXj17z_p=awC}lAiw}<-deHF?60r@0000<MNUMnLSTZoOiCF5
diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png
index e8d246c6faf0aeaa4b4ff49b8f28e79cf8c92d52..a632197eb530c75502ff25b823b9bf0dbcee18dc 100644
GIT binary patch
delta 353
zcmV-n0iOQ-0iXkrNPhuBNkl<Zc-nkYyKTcj3_U3hkj~m5+CbVM@&s`j*B-&WiztQb
zC>zABD`f)P8^{wxo**s*1cCB+cm#;^DFg`WDDv^~lMKV)M1D^vr}DGg6)+9-9h%)P
z7H{-VVM@G@H$~xNQx^z=9++4`SI~<A?Vxjf-)nq2lHAi(%6}XFPre0g3C%TUVv+^5
z<#SFTNjT6iY%=jn3o!<jQlym`)J$@$>|5h3yd>ce@$;E2l&tCus}Ja-6u8@L&QSmZ
zQnQ5>+wcjX?_+ceb_RP^%}v#e)Jw8z73ivk@AZ1m<lK$Rg?Dg{-9b(5X%$TGp)-u!
z)fTuK39j+|Vp@VL0%eAU8{Gou@fvJEr3Ltt9b!7tt5iN9I5BPHnrvk<0?_ebz6^C)
z<tz-0GC-vnSv0hL*!#Z#1le-$4ec@(_b0#rEzpATy1;!O00000NkvXXu0mjfQTd`G
delta 189
zcmV;u07Czu1N{MzNPhsINkl<Zc-mt4|NlP&27dogpC~aPW&{yn@ZnKDkSqXV1&9EH
z0E2+sN2nY>h=hti0OAQixrrbSBgka100V;q11h)x!~szD1|T*-lRp5m5M;o6ux;dl
z4@^+o$psTYE|7=%ivj9SLasqpqre0VjE7MF3qbu%2wZ@wbv6L$Wr2jZ+(Bq)6X$S9
r?11$!F;ECb4HygtAaWy_03g5sXx>_}&g`$S00000NkvXXu0mjfqwz`m
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7f33330123d..fba8e0b06c5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -28,7 +28,7 @@
<texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
<texture name="Blank" file_name="Blank.png" preload="false" />
-
+
<texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="false" />
<texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
@@ -51,6 +51,16 @@
<texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" />
<texture name="Cam_Pan_Over" file_name="bottomtray/CCam_Pan_Over.png" preload="false" />
<texture name="Cam_Pan_Press" file_name="bottomtray/Cam_Pan_Press.png" preload="false" />
+
+ <texture name="Cam_Preset_Back_Off" file_name="bottomtray/Cam_Preset_Back_Off.png" preload="false" />
+ <texture name="Cam_Preset_Back_On" file_name="bottomtray/Cam_Preset_Back_On.png" preload="false" />
+ <texture name="Cam_Preset_Eye_Off" file_name="bottomtray/Cam_Preset_Eye_Off.png" preload="false" />
+ <texture name="Cam_Preset_Eye_On" file_name="bottomtray/Cam_Preset_Eye_On.png" preload="false" />
+ <texture name="Cam_Preset_Front_Off" file_name="bottomtray/Cam_Preset_Front_Off.png" preload="false" />
+ <texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
+ <texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
+ <texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
+
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
<texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />
@@ -499,9 +509,6 @@
<!--WARNING OLD ART *do not use*-->
- <texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
- <texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
-
<texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
<texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index a569b62e967..5c09bc3a02b 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -34,7 +34,7 @@
mouse_opaque="false"
name="controls"
width="148">
- <joystick_track
+ <joystick_track
follows="top|left"
height="78"
image_selected="Cam_Tracking_In"
@@ -50,7 +50,7 @@
visible="false"
width="78" />
<!--TODO: replace with slider, + - images -->
- <joystick_zoom
+ <joystick_zoom
follows="top|left"
height="78"
image_unselected="ScrollThumb_Vert"
@@ -80,66 +80,65 @@
tool_tip="Orbit camera around focus"
top="22"
width="78" />
- <panel
+ <panel
height="78"
layout="topleft"
left="36"
name="camera_presets"
- top="30"
+ top="20"
visible="false"
width="78">
<button
- height="30"
- image_selected="CameraPreset_Rear"
- image_unselected="CameraPreset_Rear"
+ height="40"
+ image_selected="Cam_Preset_Back_On"
+ image_unselected="Cam_Preset_Back_Off"
layout="topleft"
- left="5"
+ left="0"
name="rear_view"
tool_tip="Rear View"
top="2"
- width="30">
+ width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="rear_view" />
</button>
<button
- height="30"
- image_selected="CameraPreset_3_4"
- image_unselected="CameraPreset_3_4"
+ height="40"
+ image_selected="Cam_Preset_Side_On"
+ image_unselected="Cam_Preset_Side_Off"
layout="topleft"
left_pad="5"
name="group_view"
tool_tip="Group View"
top="2"
- width="30">
+ width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="group_view" />
</button>
<button
- height="30"
- image_selected="CameraPreset_Front"
- image_unselected="CameraPreset_Front"
+ height="40"
+ image_selected="Cam_Preset_Front_On"
+ image_unselected="Cam_Preset_Front_Off"
layout="topleft"
- left="5"
+ left="0"
name="front_view"
tool_tip="Front View"
top_pad="5"
- width="30">
+ width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="front_view" />
</button>
<button
- height="30"
- image_selected="CameraPreset_Mouselook"
- image_unselected="CameraPreset_Mouselook"
+ height="40"
+ image_selected="Cam_Preset_Eye_Off"
+ image_unselected="Cam_Preset_Eye_Off"
layout="topleft"
left_pad="5"
name="mouselook_view"
tool_tip="Mouselook View"
- top_pad="-30"
- width="30">
+ width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="mouselook_view" />
@@ -165,7 +164,6 @@
name="orbit_btn"
tab_stop="false"
tool_tip="Orbit camera"
- value="true"
width="25">
</button>
<button
--
GitLab