From 45cebd19dd365dc1d921d06a33864872b682f448 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 23 Sep 2010 12:13:43 +0100
Subject: [PATCH] STORM-128 FIXED New friends list permission icons
* Added new icon artwork.
* Reordered the icons so that the most common ones are to the right, so that they change position as little as possible.
* Removed old 1.23 icons.
(transplanted from 5ed5fa607e2ce3eaabc8f9716bd4a6ef5933aa64)
---
indra/newview/llavatarlistitem.cpp | 24 ++++----
indra/newview/llavatarlistitem.h | 6 +-
.../skins/default/textures/edit_mine.png | Bin 0 -> 639 bytes
.../skins/default/textures/edit_theirs.png | Bin 0 -> 634 bytes
.../skins/default/textures/ff_edit_mine.tga | Bin 1068 -> 0 bytes
.../default/textures/ff_edit_mine_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/ff_edit_theirs.tga | Bin 1068 -> 0 bytes
.../textures/ff_edit_theirs_button.tga | Bin 4140 -> 0 bytes
.../textures/ff_online_status_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/ff_visible_map.tga | Bin 812 -> 0 bytes
.../textures/ff_visible_map_button.tga | Bin 4140 -> 0 bytes
.../default/textures/ff_visible_online.tga | Bin 1068 -> 0 bytes
.../textures/ff_visible_online_button.tga | Bin 4140 -> 0 bytes
.../skins/default/textures/see_me_online.png | Bin 0 -> 330 bytes
.../skins/default/textures/see_on_map.png | Bin 0 -> 613 bytes
.../skins/default/textures/textures.xml | 8 +--
.../default/xui/en/panel_avatar_list_item.xml | 55 ++++++++++--------
17 files changed, 49 insertions(+), 44 deletions(-)
create mode 100644 indra/newview/skins/default/textures/edit_mine.png
create mode 100644 indra/newview/skins/default/textures/edit_theirs.png
delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_mine_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs.tga
delete mode 100644 indra/newview/skins/default/textures/ff_edit_theirs_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_online_status_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_map.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_map_button.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_online.tga
delete mode 100644 indra/newview/skins/default/textures/ff_visible_online_button.tga
create mode 100644 indra/newview/skins/default/textures/see_me_online.png
create mode 100644 indra/newview/skins/default/textures/see_on_map.png
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 8fc4ad6763c..06ac189cbde 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -449,20 +449,20 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
//info btn width + padding
S32 info_btn_width = avatar_item->mProfileBtn->getRect().mLeft - avatar_item->mInfoBtn->getRect().mLeft;
- // edit their objects permission icon width + padding
- S32 permission_edit_theirs_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
-
- // edit my objects permission icon width + padding
- S32 permission_edit_mine_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+ // online permission icon width + padding
+ S32 permission_online_width = avatar_item->mInfoBtn->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
// map permission icon width + padding
- S32 permission_map_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
+ S32 permission_map_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mIconPermissionMap->getRect().mLeft;
- // online permission icon width + padding
- S32 permission_online_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionOnline->getRect().mLeft;
+ // edit my objects permission icon width + padding
+ S32 permission_edit_mine_width = avatar_item->mIconPermissionMap->getRect().mLeft - avatar_item->mIconPermissionEditMine->getRect().mLeft;
+
+ // edit their objects permission icon width + padding
+ S32 permission_edit_theirs_width = avatar_item->mIconPermissionEditMine->getRect().mLeft - avatar_item->mIconPermissionEditTheirs->getRect().mLeft;
// last interaction time textbox width + padding
- S32 last_interaction_time_width = avatar_item->mIconPermissionOnline->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
+ S32 last_interaction_time_width = avatar_item->mIconPermissionEditTheirs->getRect().mLeft - avatar_item->mLastInteractionTime->getRect().mLeft;
// avatar icon width + padding
S32 icon_width = avatar_item->mAvatarName->getRect().mLeft - avatar_item->mAvatarIcon->getRect().mLeft;
@@ -474,10 +474,10 @@ void LLAvatarListItem::initChildrenWidths(LLAvatarListItem* avatar_item)
sChildrenWidths[--index] = icon_width;
sChildrenWidths[--index] = 0; // for avatar name we don't need its width, it will be calculated as "left available space"
sChildrenWidths[--index] = last_interaction_time_width;
- sChildrenWidths[--index] = permission_online_width;
- sChildrenWidths[--index] = permission_map_width;
- sChildrenWidths[--index] = permission_edit_mine_width;
sChildrenWidths[--index] = permission_edit_theirs_width;
+ sChildrenWidths[--index] = permission_edit_mine_width;
+ sChildrenWidths[--index] = permission_map_width;
+ sChildrenWidths[--index] = permission_online_width;
sChildrenWidths[--index] = info_btn_width;
sChildrenWidths[--index] = profile_btn_width;
sChildrenWidths[--index] = speaking_indicator_width;
diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index ffb988b2abd..52187284eb1 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -143,10 +143,10 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
ALIC_SPEAKER_INDICATOR,
ALIC_PROFILE_BUTTON,
ALIC_INFO_BUTTON,
- ALIC_PERMISSION_EDIT_THEIRS,
- ALIC_PERMISSION_EDIT_MINE,
- ALIC_PERMISSION_MAP,
ALIC_PERMISSION_ONLINE,
+ ALIC_PERMISSION_MAP,
+ ALIC_PERMISSION_EDIT_MINE,
+ ALIC_PERMISSION_EDIT_THEIRS,
ALIC_INTERACTION_TIME,
ALIC_NAME,
ALIC_ICON,
diff --git a/indra/newview/skins/default/textures/edit_mine.png b/indra/newview/skins/default/textures/edit_mine.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0bc7efd255dbc817b342b922ddb5d3904df9ec8
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!AxT6*RCwBiQax*$Q51gO*KgD+iVn@-
zM*~7Sl*HK3rbvnuQm{)R2%R!GNENbmNQTmXkPI#&)LFz$gbvaUEeMfL7NtW&8iy)Y
z5kKJdtLI*-jW*T?9^UufbMJG{dCmbA(Cv1&+U@ph`qdK^Sc1u9!YM2U8jZ#?lgaeH
zUayx@snlh^-+!W3t0#gWoKyHL8jZH50t~`%IQ%G+$-K*6%H?t>l}b=36rgi05=zqc
zc_b3K<O023@3Tgud4&IfvOy-30hI>I2BIjkZ6@?q9FNB$R)DfZwOVE6VKf@?y;iGv
zRH;<H%U4~F#bW$*gTa9H^?Rt*YFtQ?Bpw%aI^7}F_44uVE*|deARG?!K%r1TAP_)0
zorc9?fzRi|-riGC#<R-|EQ4RfPxm)AFeYa$Rx1*T1l}c+P^nb7yS9d{%}s<tAt;qf
zSScQl$1xZTW&(ZU6}!m5)GvxfIGs*t$gn$<y4UOFVhk>q3r3@n8#@)419Mof*Mmxf
zTrTHpX5vjlZ?6C80Qtdt&eHwUF68rhbUK~cf3w;AD=;0&WzcE0&=P50_&N5v*=(LO
z@m8>b@pwGgcDs2OrU(Xu@caEJl26%ec22-Sd_z293wH7O{{F4vEF)&D!{PWMET(^Q
zdTOW7@!`S2E4SONTrp=Kgk|-Y%jE|@uCGr9lJtVk2sWGTo84~zO5M4l@K0imc=20+
Z0RXXA)^k?4TQL9t002ovPDHLkV1kP|C@ug1
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/edit_theirs.png b/indra/newview/skins/default/textures/edit_theirs.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed36ad7cfcec78f3d68bed969ea720e05d94ad1d
GIT binary patch
literal 634
zcmV-=0)_pFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!97#k$RCwBiQca6eVHAGuy(*fDI^rS)
zKR|FLLFOuR(P{*Pu!RuF*ep{BYBv+a>=UPr+eYy(xRq#~IJror5hG_)8cKeDciwkU
zW(Lgz5BL3e&U4TEoC9o#(P;FhSS&uI<sE{!iL+cTIfUzn{eJ(xLZLX7$z+dGsnkiW
zR<l{H)~B>**B=O{@p!zm5@5jvI-QO|rBc17<hR%o^?DuIZ1yklGK54d7W=^khQr}w
zO8h8_q80y%QmKSwG6|>C3B6v=j?M@tV!PdzPp4BEcEor*25~`LTvgqUR;$&zXf~Ta
z2LgfTnM`Jv1{RA2TCEnZ=HjA;Znw)lkO;aLhlhXEYBiz<2k>}2h(sbNm&?#-G~6)y
z5nL`87a+6OqO9~ep=~mm_{IA~0zRJ)5;=dDlGr)50-;a{I-L%UMg!?|di|8u+n16g
zL95k5sZ`?Y`8nqEIV=_nPYMQuaJ$`{XfPPKiOpv7hQL)%1p(9%>=})i&1QU0-N9rs
zS##Jq!zwmT8B1b9a=Dy~<nwv-dOd!})~p+A?rJ2rg@%k}<_-n}&SQT!Qiaz|+!)LY
zuh)wQ)DdRnD#GC~_oPrLAeYPC5O5IQ5u$9v5(E4D8^u{ge!m|MhodOmF8}EG*iN5U
z&qAS>G!Kd$v-L^X_Wnwxa<6fDc{H6&o)AZ{*=*nKcKbIPte<rKi}0K9<(~ip08L-k
Ux@&Rhm;e9(07*qoM6N<$f-syPbpQYW
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/ff_edit_mine.tga b/indra/newview/skins/default/textures/ff_edit_mine.tga
deleted file mode 100644
index 8f0c35b98fafe79c785401dd11617bd113f84395..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1068
zcmb7^Z%7ki9LH~4W(;XEsTRF4B#NU85n0TnGT7#kUgh~Gv}Lpylnc@_7De{L@I{QE
zU~DhKD8jwa#(L3F7))nN3JO-e2%%ntt%8HI>kq-~+dU6FaS~}BeEB{6_<g?j{oMn{
zaaN8!<y<*exhfKg46Q6JMg5*e_@y?;UB__Z%m9w|^rLRK4^^9as<PD%*lf09I2^tX
zfMcrJUXKxF8tKVbODdJg!@Z*c>2z9R{N9$%1zddOK59KX|GalaNeR}i-+%^xGX}22
zaq9dK0)fCS##gLai)%Mi3p~tO$PVXvTTv}k!R2xlWLX}~<#Haz$6~SLf*|CLuY!%6
zwt!T#f&m{eHx7K6#Nfpc^<b>IIvfsde6Sne$1YHPyxk9r#qvvgf6rjEfS!Xk`v_#t
z%&{}+6Nd5cZuC-q_D#xQp8#K<Li;eWB>(x&S;%!ftXAv1BzmaF{-#~fKV_j6vWxOT
zZw<X;NpwRQy=?5ALH1z`o$Y?w4|X3|l&=;lk+|9eXb&h0eagr_ZDfCj;rJ!EYq!E~
zw|`?ho2#m-PDN1~d7ghAI?{|6kB2EclfR3;lZWs;!~G>Q&(6hS(UwRgLgcPHWG|df
zry7k$`v_lnDPivIVd}%?|5bHeFH0tq9i);O!V?ziX=9(U|MD<<v;2g`k15RmoLQC!
h;aQI5vgRDjgZ0?optYsV+b+uDK1n#}6Pvu-xZlX#qG<pC
diff --git a/indra/newview/skins/default/textures/ff_edit_mine_button.tga b/indra/newview/skins/default/textures/ff_edit_mine_button.tga
deleted file mode 100644
index 07627a65c5324d62dede19b26372595bb614f910..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4140
zcmd6r2~d<}7{{r>)Jzn`%Ca;NQNjgxS66672^Ls^U0`?F1(ZV$QBVRo9K|q?JjOhx
zF(%V7b-XaeBN3DkMNqRM&^*$@a<Ic}MmyA*<k$Oct&u~H3=FnA|9QV-=lwm;|9#%~
zd%v}_d)&_U8DuBE-AXpC<x%KB@h0Za${|$a$JB&aQYM%?RT5KT|6ll%qK%|Zv~-Fj
z*8TY>SPUeKF_2`?htjQkcidi<p$Rn*tdBxxiX(1v7U{WjNy{!E!jg#6+ZR{&;kdZD
zGtk);2gg2$>SD;?!6d~--RsZRudS6>Q{rR(<$t2MCe?r?GMtd$U}Opvp@tX|({o9h
zmM@rd$eXvE`774(##?K6ZPuH_CS?#2orvBXPe^18V*<vDn8u>=@x?6qNsKnNT2m71
zzxZ;M8eLQz@9#d$-lJzIscK-?;d;^5v-`+t_Evu(bk^GL5%*ha_mKt;e$vRYHQVs^
z^~b0WYcpRPE^6Sl*_55UL{&o*WgmY<>4}T%7OZ(I))Ho#NKlxOAf1U|p>csB_-b_M
zEXkzj&122>gA{EkB|a^igt+)N^VNPqnB&vfyuXG+pMAqepI@O|#PDJ51s1K|h%q*q
zFyjQmqZ4>FSWmYn9q8WmahwM}!ysp8{50c9N}a}xnT1SEO=&aV>FH-sj8+Q|w^DrQ
z6RYPtD?evvW!>N7&|tkL`MkcQia=d76JxaGPY*}!?T*6Joe8FhR=Kt{=0W4H*J_9{
zMUs=1MQnU3ZZah!{dK(HuB4x{2mOb5@vN&C9wWzC>rAa4$%dj_zP_}RQ?=_@SdfH%
zyuUSuWHAS9%$Dtg_$_~@QYv}U-kva#SA_B<BIE<mc|J#^;su<#*jeY=>$zsGT-pJg
z6FSeeri08YNI@m{#1bCTF8*kRoX}T1`D|q>f9xrQibYVi0IHUf5hSOlV=qphTqn47
z@au7*T5BAoyH?@m>Vhsfpq=~?nEVv{uqg-j&4u!XP`Mb6uOLI?Mb{oZxKOu6FdK!=
zz^zlFJ<q-mRxxzQVD!P7cJWp65yS?nXqIxXUdHzubJ&m>&g@7ZlrH`0-`@$d!JkD7
zGN`E(J~TH7{x!<?7BQ>?_>%vIv2rfHJDtY$S-dkPgi&q-uz#Wp-aax?<3n)l-IHDp
zPcdntj$;+;Xlgpi)(uM-=H}Y&{JlphQOn$zX&i&>#eO*T>Os&rPv+#saH^_^?=P0H
zuXqVr>1GsO!*J^Bh}ooNYD(1K{s*<sf06&d=lU^bgbRuhgPE2dL3PDSu3jvL+cm;#
zsqSiNytI#v?=2)qqZM&@GvIj-`Zx|C-mGmGUo%!M@^Hah^)dxBqNzQ&oL_z{rTJ!+
zs5MdVw?BqEpK|B-I(}%}&(ZQi^0RzJ3=VjC^x%zrxsZl}>;TdyMc#|$VduZ}oK7%D
ziszVt$#G_8X2vlyJC^G5)o@ef-(1hF>&Mu<{%tYmL#Zk2!>Nz#soY~nMag3vEA1lA
zyKu6?p1HYxZRWRJi=^Wz2^JD8dL~4LQIMBJ(aL-#CmDz_#*mR5&e2kPuAb@5&tHz>
z#@8y&*4lHR*ny>mqsdIsx0`Q^NAl0#*9UEY8ii~)(mFdOA&SF$yVKMl=eNt5+-aId
z)45<i+~z^f)bV0p_0L-Tu>RY4t+lqb-PRUl2T^mND_81AbGs=6u4mGGYX{fA&Et5v
zJ#%LGcUb<d#Z#CQNNrg+>W}p0yK{k}HpLvddxE>SPH^+5ZPXr8im~WxjiDp*zdwe;
zoB-;M*s*_WZ}x8=%FkEwxqJHr{Bik#{E&dZ_Wx2$_xIVBb7_uAb-ws@AF|Uzt)Abw
zwiQVa^1q|_()^a@SVq!cdyhhKTvzQWB%?6LPwY31_wsA$e@F3K^GX_T+nBe!-x^<9
zXQW#03`wlCxM-x@ZTXvZT4D{lPLaftVra>4=}%`IOYdJ2UwU79#IpV&V2m_rqO=CB
OUN_tls14P~?EVDG3cXJN
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs.tga b/indra/newview/skins/default/textures/ff_edit_theirs.tga
deleted file mode 100644
index 005ada2deaa121415d9115313ce1d03d456ee789..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1068
zcmai!ZAep57{||E)JRdc%nAvVVTm{q8LLg5o3uA_x7^gkUW^ulk{~mKD6$WRAN&v$
z#QG3M5khFAK4gW$a#m7Nuq+6nh_Lm7FkdQy+`oGcJD0m*b>Yu*&%Mv@|2*e8mrIC}
z@GGC>lj2nx0tJ`Da`U1}mH9g-HxIha<xFO)0|z>LaQJvHe7g_ADYT%r!G+AMEV!)q
z`bCydzQGt1j5Rid!cp9wnEtPZMyF7{r54HB#8wl$cJx#~dIy5AIXzgnp$O`X45<%;
z$%5d}-4x&L-geF_Oce{}x~&7l>kBJmReBvxb~S_c{<mH(Tn%B(+Cs|H{+TG-cP0QV
zOaSv^@b7g%oK}iTO3T=~tkfHIS*8zhmd3o?jq&*GII#Fw^oSt-@eULUW#aSo9{d<N
z%{1260h%Y{==@oI#(#PUEIk!Ho?!NEi1F{QbV)q*`X?WYVDU=?I~(g6E4WQiD%HzA
zb2+}=IDs@?I(y!~zoQBC8)$EJBJ$vpIEOGshtEN98`*Qey;@$M^Q`~u)dk;;h6)S@
z&x(6^ChlQM)Fksj{5~$9??jcpIGv{~o571PVdtsUYH{qy9?V2<F^`vz1`*ir!6u#O
zwbk&=Ria5~`OG*&<MOW=B-g}M|GZnP(ar7h*+I|MS@$MTpn{rnJkoqBER6s^CsRC%
zvJ*MmOdr~4<oU8F^*sM>A28R=Jd*X<yYyVyn$1gGD`<Y~l>q9IWTknmkk2_Ohcf9}
efs^+`?<MiSL9@5T-s<+bcL@46hr7{UN&W!*PU#i^
diff --git a/indra/newview/skins/default/textures/ff_edit_theirs_button.tga b/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
deleted file mode 100644
index 798ef641d36954c2911df04035662a747f730732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4140
zcmd6r3s96*6vtN^(^3gb##bd##`q!($uR*@c`mTL78Z6{mStfV<h=t3J~9+Vdx;Zh
zso*m$lu!`GR6s$IGzmn_Fdb`f%w}xHnla7%b(ez5*%*jM-JLV{d))bc=lsvP=exTS
zNq<S_$66x3gUYsU;9=PQlC3PApN_BlEapb3h>cJ@P%|-2>_>^OSBLQ+%%rus_+!L%
zb7s&eadY!PBI$?4u%{VoGmaN+CopcpWTsAcAuvo!oN*xu8E+D4NJAD9iI;yU?!Lj;
zPPAjl(4nLyCv-jg-}vTgAW0uhrqPI}G(fOs;_N2HCrF9ELPKD<7L_iM)cMQFd3PO4
zR~3=D<UQfbB6Laf&?aQy8?406VH(CXBN=I_T{UJdeslZ`V;au0Jb8D037?(1%<dyC
z>^a){4=b-bOL^TnVQ0ntGnCaf^Jz`97+WY8b2sg->G1Wn8LqwNFU!qC6K7=Y_Pwkt
zsUjhB39_&lT-;^2didZa3&GQ5escUm)GS%Gf!%_+??f9_pMOJbOFLDK7tyCKz&jwU
z*ZkZiITRLcW9f<l<Y79jZEUa^JAx+$_Gi$O7R>hYCm=iuKY0XlRSbEBTiAR20tW>9
z@R#3l@bncvsyv256Ni(~u~Xxo>fbp(*<e5(pulPRc;+PspjLY0Aq!_?S?!;BG3nmY
zp?hg{6Q$K(cI0B$;V;N9+Q~F0S4NB)-D|#H9ZpJoyr|z~3f|7-<nbadT`Xnu+6<hW
z9GUjI3zHn389C0LQ7_wLWiyHACOG0aM~1DP0~rf*Se?I`taKwuak0JUM`;L?N3tR(
zg&*4Y178U{&vzGh@<xV2tVs#O2S^BVcn;YsqX~TVSpuh8<2QW*mV*Zqp^EBac4}!F
zd#b-7TE|QmFAi3$6Wnv~^KoGf;<$-3jYSL{W=W#wt5EwEROP~<Jnrs!gVXtXR8lXL
zipak4wb9ISl~T25{U7{WC&kz*>@pXcwli?>5E9+(p<xwNuYd!~pkguKZ%aq#@7rg-
zUhwD4_NAt3i(p=ddo3KRE+Q{C5k>GEMvWSd<4dDi80^I6lmM=6Nr$?(xmUiJ_#heK
zq3S-z?<V-AJKm?gy^;Du#YC%RJY_M2VU`x?H9ovP!=3>H2l1Niv#g2t<?==&Z67A1
z^^^8F{&-ysCVonS7Db3RR>Q4uupduaLMRm_E4kKI#>v{XEXq{k>1v0S@X7A^5oF1o
zkUF~%q15&%e!VsZTU%!)j-Q0bY)7G|l<garap~)FQHRGwPMYACV_a=3q3%#VNeMwX
zOc{ssloxqn%nO7o`d0tx$<fT1HWIfvPQ*s5*|aW)Z!c7G_s(g!eM+!Dhg%KYyIIRm
z*Y|O@v6zB)j06U{<1XG+F;Rc5`Tw&1KG~$<K<Q&FNRK1YkjP6m)<mgf>?>Q%ts8Zs
z9-HB2J#_~P$TF(f_(2}VxjGVKHN;1$F+?hRrGI0Ml<LYq-V?jFYG`ls=hlzQsoAe)
zenun)T`Y^T7qBunm-N)Rtj(XtTe;aRUNE2B#aU#h#hc~*J@)SU&*@qTO-C&#F4PJw
zJ^B91B9Y@8a5szHI|4{g(sevP#h^tVq(ZNYKp!24LDRcE<iGVl6aQ3oKfb7WoEzV!
za_>&P$gk*m!iQ^D@;F&zMd3Tzu6<ful(Osi{usME?~Z?_-jb`WGx_xg(M#@DfbhYj
z!^M_h_Iw;kcB=WF(jD*qd)@KRH;m@yrC5Humcs4pnL>v&S{i1vqgd0U+}_VJcizeO
zar@`~-=u$Q{WG*TOFMkH+UnAgi{drr`-r(`_vBi4{H7xVI(#^PVhm^Mhl+ZT&|E);
zn#%w0H%fPWlLqF@v^IMZTTkYg<Hx8%c@Spu&%`(7{{H;;#P|PW&ZELN?cW}<b^IY9
W4+?P)^$zy-mrV}y@b-1Lll%_&bmV6M
diff --git a/indra/newview/skins/default/textures/ff_online_status_button.tga b/indra/newview/skins/default/textures/ff_online_status_button.tga
deleted file mode 100644
index 9076df6b9e82bb6147915a27eeff096c60594b39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4140
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
Ai2wiq
diff --git a/indra/newview/skins/default/textures/ff_visible_map.tga b/indra/newview/skins/default/textures/ff_visible_map.tga
deleted file mode 100644
index a4dad78dad145268a5db9afb68ad4f31c38f54b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 812
zcmZQzU}As)0R{mE35ErvgMY^2`$M!6B1F9-1#F^t9in(e$|OaKBn8W)1*=dH#B8AY
z7lFpnks`j40^Sk)+yO!?a_nr{T>P%0LWLmpLM7575z<1%(oprza^Lg3KV`d~i`I8i
z<7Tm8=3dXiHJy!7m{Gt(OejZMBwiXw0yRR_TS@(lb^I1-{W{Qyft7*pHYfi}E+FFU
zWaH4{77YcN3~?Al{eKgQUqM#i15BR<8#8h<@IM171|qIG>}=|s$X<Y&Z!P^Z&f#l-
z=_7Y_2SqOSY*wHa-V2<}I!wG#B3RUWDtsyRJsF|v8Og64#l>O7#lXnG#LLWS&xfoS
z$cCD4EdJfkBr#k>JC<9hQVOC*C5}rij!P$&+aj75NJ0b=>V1vFBZSmrxdbc00az)e
z9mnk*$$!{Q_LZYjo4=Sz43BCY7gW8s!k1$2o)k5MSRRow3E^@{%~)=~Xu(GwDsLT>
z-nyy2^4FRZCJS^eME!qb@t=VfFMah3L&cn;_<&KI6e{@0N%6IV(lr-_Jw9>=gOu+C
zYd!H$hnnvw_cO!ud#cNqc)RP7hPMK=-+F4k2+-afsuUF|1ayf-G*4Zi*kex(sQJ!v
zzjJ(lW_o?k@c5eH_BqAzV}S9&FpYp1A@M>n;XEl|S~8B|Iqa(nRc|KwABapPfe{Bx
zOaF|-{ul^<G~x-fWL5OyQgq@{bmj80Wch5w3sFxJ3Cj&3L7}c;p242}e!3BEo<6R6
F3;^QOCL{m=
diff --git a/indra/newview/skins/default/textures/ff_visible_map_button.tga b/indra/newview/skins/default/textures/ff_visible_map_button.tga
deleted file mode 100644
index 8d13adee3f0f27a5ceb3fabc53861dd6610cedc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4140
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
HT;cOCH1=Iz
diff --git a/indra/newview/skins/default/textures/ff_visible_online.tga b/indra/newview/skins/default/textures/ff_visible_online.tga
deleted file mode 100644
index 74e3a4e318faa0df3f26da33eed29bbf5a10f326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1068
zcmb`HZAep57{{-zB5~o0UW`>Z5C(%}WEiCs8z_#&D!0^LZYzn!a<wlJ;f+hiOp=O4
zS%|?xh@#PIeQ>e5V9|?n!NA@Y*!0$og*X{q+LY#=&U4|)kf1Lf_;b&B&j0s6oEI)d
zEu!S6qEuA*G60|!Qn_4C(cj-sH#9VaG#X6;g?+63Zyle{cSNC3<Y=0H6$*u-iA3TX
z3j0{AuC9)t=U+K)x7(}LY7>!2<inq75k5UQ4bkozh+V0H&vy<(HpK(Zp$EN%8927t
zY;R{s%Mjm7rUJfP+YW-yJf|VH0w&{wfFAV98C_jnXU%5wFxE*XM6cGv*IR};PR<xQ
zR}S164diArQU)@};(mFa|AB0FN`UD33W*)-Gl6xR8jO{zA#!OaJav}9lcN+Q-#tVt
zAcHJs==J*e#Kgqp)aV=dczKJ&53sdBZdww%X9GMsL_yF_!8q3g=tTxu5=F5r+o99x
zMn{HU@b9}fOZ@n46CB*J9@>vvrS*n;Xn0Ih@H*I=L@zSP%JO=>?&9L&%*jUm&u6Dp
z@SG@UF9NQ;3ex-t3|=sR!>~>yo-BH04&O^Em0F2ovZswMSKE!Xt4e?E->S;C)h?Mm
zQL}iqscQN3niVC#osMID{P<WodeiB2DYDqdw-t-U^m3*k2<nTS9;VfP;BG73a<8+4
z?f6c({4DY3^F{G^TwC~#FvnuC1j)Vn!{Kn9oGa(y7i%2H8JnA%?;DLqj$HTB`STu+
zhfyk(BA$C$Sy>X_D@v_a3s}SRVHn0UpDoN0MNt_D1opaIuImnmqZj3LI&b>@ejDz&
d(7O<Q`EOur+*j9RvYK{VHnr57cGXo<e*qqClkWfk
diff --git a/indra/newview/skins/default/textures/ff_visible_online_button.tga b/indra/newview/skins/default/textures/ff_visible_online_button.tga
deleted file mode 100644
index 08a6cbedd9b84c4ca567cd4a211ce4a2101c1c3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4140
zcmeH~3s6*57=Rb6k*O&#ET<Y@JrPhba&+;92?#8^z+PAuc9&&$VNo6nf;uCS8kRX&
z%ELzrSO!i$)5=FWq0m%=`Jkt!m5OC3np#Y$Q~Gt!b+!^WacatD>hAn=cjuh{`~LHv
zyJvP)s%|Rx)lVhAyw}&&a3f;N>N;i>PbM~EEZONMGR?{VXb7ip|L^zQ{|tFQ{z`PU
zpMR$Ry68ye&Yg?dY$iB3nBKj6D<R&SOeW^cnS&)c@w%R)f1BTClswj*<FHayK9Asm
zf%Ne8AtTet?6P?*t6xj~+D+82*+gyqI-V&j$L7c&WXKTWVl^zNn2*Tyv=747dHtUJ
zS?Ol-CT5YHolSUnILRqyURYW~<D2VfZQ07{1KT-!a0f^CY-GplFSDSkiu_5FvDqEu
z<m8Yu!HHmWuHpLpMhfzB(dl#q1qD%4Q^Swv&T;XFc3K-M*i#w9`?EvXTlN?q&L7Q@
z*NeGuVm}?<ou;~`R>={$f{|%9UQt6={t0r;B2N<&!$f)QO^r=_`~7*&eBQ{%OC<I!
zjO5_LFuq(gMv2zy2wInEIan)ka_<_Bw|zrnQxn;84+KN71k>FIPk#5<)JZNT7q~DO
z4CLkI(a_L<xPEHi&!@}nyf?*<ePx3<u{?^7HF`Q$CvbL^#NmY_c(?F&c0V6R$AN81
zPQ&&_g&|miDcHhuEq_T#iL!T+B+=a5tZ**=bb(J+<g)82e_E@<Irfr<BefbnTRfiq
zi^j|EwH#hNj`yeE&t`{;=JHrBe1B5OZQi*P!4l7dVE>U{)Fj4ye0&HC3!|l_g-e$%
zDva}I+xSTC``#IS_-1)5XJ3iqjVDJiG5UVe#`dMYNX-{jquEh-7q1#sG)^Bx`$t>g
z;(3K3Sb{0oUHL;oLWqirqO!7*<0sk`f5%rX>|3H^|Llk4wd*)iqhWIV!`$wDGdFpu
z(1-Z2CbJjo%_`PPD&CsfpQGCs$hkjry#18I5=_DF%KzNlG79qZ2@DKmenpjB!!b@B
ze48&{GID5MFkii><&y>DNq@W_H{a9^@9y2vg!)sPJCqF$Up6Frv3=?T9NJbv+u?mw
zEL^Iv1XHlP@@L!An3Ow#qM{;(t3%0i<<oxX1CFh<a-@6^$5-e%vr?kU8O-Q`_mLPe
zjE%3Y=exE8>|T<=X4@^iGwne>Z>l5PX(M!Gn8FfF!S2d0#<S8=DRSjvwWgts*W<KX
zcs4`LThkuqXn7D{R}N-t!97$N?xfB&lv7{qR`#iNbv`T8doU%!2dg25SgjUYdb+|A
zOu=@?^_+jt%$$zhZpW{OFQJbPpwtpfbxL>Y(r#sy*^5`@{odg0$<CLjv1`*ZRuqk5
zW^y3I{Cg=m4*5J547c<5_v`UzrKQNZMody11}T9gNymft+)Bcuci<Z1P0=V7MWa;|
zjJp&4uzTgP+mN*5k>X;N9FcpO@!PuHHC)S|=d?4Ur1*+6E6ZlVY)t0yk!n(+hLaIH
z1Y5#L(sgQV5szRPH<YoVLopc=<ul*%>zcEyCT2YO1cK>yi~F_wt_c~;Dt!v8DFw4Z
zkG<3RE%NQgc$`ir&Wud#$#GY(#kj+gLaG!`szKuES*2HvU&}A@ofac@s|Bt64C(c9
z?{%817-F8MNYce%NJ=6yG7?kDWme~TUHQd)hrI4Ixd(-Xg$xV~;_jY)a`dE6pT3Mx
z4<|vZkt2qYp=$c~>#vN7IROLwak*S1C+e}K8a&q6+26T7_h*MCmD18u1`i&L{LcX|
zFE4z3eew7AN3B*X5fBi7pP!#HCgzCG#l^)~Q#`u`+wIqcd;b0D_Wxb?|NWQ$|J=y_
j3-^EBFTO7~IApy_m8egOFhonyak_!V$mrOJL8@N>a(t!v
diff --git a/indra/newview/skins/default/textures/see_me_online.png b/indra/newview/skins/default/textures/see_me_online.png
new file mode 100644
index 0000000000000000000000000000000000000000..52dc2ae74f5f8b10216d31e7c67a577a6207d941
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X-gvq=hE&{2`t$$4J+o><XQR`BCU2$un=Z-<p{z%89Bc}M
zLjJ|&ypq^h$+#kt&qJ0uDRadIb%inpsiJui`bQKp*%<8<&MBz!T-n&MazfI9aGj+4
z9)=0*VjJJONHg%P@pZ^jn{+{K!3~o|ybQ;hj3!jIs(g{rSk`AQ)yNgm7$PEYoN1$_
zz~==k|8gE#-dJHNpwF`Fh4vkW1!)0ObXk(pm4qKyPH=T_UUzVhfM-*h0K?KtI!_D?
zSRdJ|NH7Gg?#Vfzs!-?L#Hg^<-QW|GflkT7ne0=<T^b`ew7&9ny=VTYzu><9;V%p<
a5)8X-++4RvK5hZ}o59o7&t;ucLK6VVV|7>n
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/see_on_map.png b/indra/newview/skins/default/textures/see_on_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..200e64981883774fc8a59c8c7cc0cafbc9b8489a
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2T4RhRCwB?lRrosaTLd2F4sT_=x@l7
zMRU-oLueJuq9{!VXYHJT7YHGaX_rFQb}XlkS%Ud9o31X2+CfC{s0bOvTt?AAT$*D3
z_4}^(3ukpG^x(t${qDW@{k`|@exA{2ME~=sf4`_yD)TU3!CUY#9*^(-vjCEHm;zS?
z>fngqdpw?(Fe@MkzT<sU<|wY@1sG#E9MWJgNcQ{v_aK(b<xYhVx9}Z+BDjWN;kgPp
zSs*zJOweq%+rlsm>UO&{^?Hu{lM{4xYEu89r$fX<B|D09x`s^*0;aC(+c<e2h(@Df
zC(kY~(#EGPTHA_)ggkK7-2w{`1it0-`4~>udc7Vsn}1pjzM3AF8JyANa_P|woWU^~
z1b7Y<3WaRnW&MQiZ|>;f=Px>|9>|pACttx4u%uWd60t>EtritOd?wZRg8P@@U)&X#
z&ga_9WHNPF3y`8HluD&28jVsQ5U`WO;cy$FZ*ahcog@FmQmMp)+d%JG*g9+tZ3y<W
znAhv&8U674{p;y;+LC3A1<K_z_kPaP2T81}K!<<c5jX@@RaJGcj&(ATNLb?`+8afA
z2S*111+ee)`8r^a!CruK_zlD@u;`--<bzf;lv)Ft93}_LnSd(D;*MC)UM4sNf&~Y=
z#ia<~AEEQ)F1VhW6yU*0c<+?WcV>JSehV-FR+t`eIL#$v00000NkvXXu0mjfCaxO0
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 273531f9b29..2776c072022 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -360,10 +360,10 @@ with the same filename but different name
<texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
<texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
- <texture name="Permission_Visible_Online" file_name="ff_visible_online_button.tga" preload="false" />
- <texture name="Permission_Visible_Map" file_name="ff_visible_map_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Mine" file_name="ff_edit_mine_button.tga" preload="false" />
- <texture name="Permission_Edit_Objects_Theirs" file_name="ff_edit_theirs_button.tga" preload="false" />
+ <texture name="Permission_Visible_Online" file_name="see_me_online.png" preload="false" />
+ <texture name="Permission_Visible_Map" file_name="see_on_map.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Mine" file_name="edit_mine.png" preload="false" />
+ <texture name="Permission_Edit_Objects_Theirs" file_name="edit_theirs.png" preload="false" />
<texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
<texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index b385654010e..6f3629cc8fc 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -19,6 +19,11 @@
<string name="FormatMonths">[COUNT]mon</string>
<string name="FormatYears">[COUNT]y</string>
+ <!--
+ *NOTE: llavatarlistitem.cpp lays these controls out depending on which
+ ones are visible. Trying to change their order here will break it
+ ... which kinda sucks.
+ -->
<icon
follows="top|right|left"
height="24"
@@ -71,49 +76,49 @@
value="0s"
width="35" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Online"
+ image_name="Permission_Edit_Objects_Theirs"
layout="topleft"
left_pad="3"
- right="-141"
- name="permission_online_icon"
- tool_tip="This friend can see when you're online"
- top="2"
- width="20" />
+ right="-129"
+ name="permission_edit_theirs_icon"
+ tool_tip="You can edit this friend's objects"
+ top="4"
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Visible_Map"
+ image_name="Permission_Edit_Objects_Mine"
layout="topleft"
left_pad="3"
- tool_tip="This friend can locate you on the map"
- right="-118"
- name="permission_map_icon"
+ right="-110"
+ name="permission_edit_mine_icon"
+ tool_tip="This friend can edit, delete or take your objects"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Mine"
+ image_name="Permission_Visible_Map"
layout="topleft"
left_pad="3"
- right="-95"
- name="permission_edit_mine_icon"
- tool_tip="This friend can edit, delete or take your objects"
+ tool_tip="This friend can locate you on the map"
+ right="-91"
+ name="permission_map_icon"
top_delta="0"
- width="20" />
+ width="16" />
<icon
- height="20"
+ height="16"
follows="right"
- image_name="Permission_Edit_Objects_Theirs"
+ image_name="Permission_Visible_Online"
layout="topleft"
left_pad="3"
right="-72"
- name="permission_edit_theirs_icon"
- tool_tip="You can edit this friend's objects"
+ name="permission_online_icon"
+ tool_tip="This friend can see when you're online"
top_delta="0"
- width="20" />
+ width="16" />
<button
follows="right"
height="16"
@@ -124,7 +129,7 @@
right="-53"
name="info_btn"
tab_stop="false"
- top_delta="2"
+ top_delta="0"
width="16" />
<button
follows="right"
--
GitLab