From 8e67a60528718541e9104cee29759b71bdb4d2d6 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 23 Sep 2010 12:13:43 +0100 Subject: [PATCH 1/2] 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. --- 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 | 59 ++++++++++-------- 17 files changed, 51 insertions(+), 46 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 9f7699b3db..cc522a64e8 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -450,20 +450,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; @@ -475,10 +475,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 ffb988b2ab..52187284eb 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -143,10 +143,10 @@ private: 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)l}b=36rgi05=zqc zc_b3KI2BIjkZ6@?q9FNB$R)DfZwOVE6VKf@?y;iGv zRH;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 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 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-HxIhaLaQJvHe7g_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{A28R=Jd*Xq9IWTknmkk2_Ohcf9} efs^+`?cJ@P%|-2>_>^OSBLQ+%%rus_+!L% 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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!ae5V9|?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!2vvrS*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{PX_D@v_a3s}SRVHn0UpDoN0MNt_D1opaIuImnmqZj3LI&b>@ejDz& d(7OhAn=cjuh{`~LHv zyJvP)s%|Rx)lVhAyw}&&a3f;N>N;i>PbM~EEZONMGR?{VXb7ip|L^zQ{|tFQ{z`PU zpMR$Ry68ye&Yg?dY$iB3nBKj6D={$f{|%9UQt6={t0r;B2N<&!$f)QO^r=_`~7*&eBQ{%OCFIPk#5<)JZNT7q~DO z4CLkI(a_LU{)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<|T<=X4@^iGwne>Z>l5PX(M!Gn8FfF!S2d0#Y(r#sy*^5`@{odg0$X;N9FcpO@!PuHHC)S|=d?4Ur1*+6E6ZlVY)t0yk!n(+hLaIH z1Y5#L(sgQV5szRPHzcEyCT2YO1cK>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><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)fngqdpw?(Fe@MkzTUO&{^?Hu{lM{4xYEu89r$fXudc7Vsn}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+tZ3yJSehV-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 273531f9b2..2776c07202 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 - - - - + + + + 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 b385654010..6f3629cc8f 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 @@ [COUNT]mon [COUNT]y + + right="-129" + name="permission_edit_theirs_icon" + tool_tip="You can edit this friend's objects" + top="4" + width="16" /> + + width="16" /> - + width="16" />