From 35a5fc74c0df29b496d42e89845d00a366034b68 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 18 May 2022 23:53:53 +0300 Subject: [PATCH] SL-15312 Added permission indicators --- indra/newview/llgrouplist.cpp | 14 +++++++--- indra/newview/llpanelprofile.cpp | 4 +++ .../icons/Profile_Perm_Find_Disabled.png | Bin 0 -> 1608 bytes .../icons/Profile_Perm_Find_Enabled.png | Bin 0 -> 1287 bytes .../icons/Profile_Perm_Objects_Disabled.png | Bin 0 -> 1356 bytes .../icons/Profile_Perm_Objects_Enabled.png | Bin 0 -> 1137 bytes .../icons/Profile_Perm_Online_Disabled.png | Bin 0 -> 1312 bytes .../icons/Profile_Perm_Online_Enabled.png | Bin 0 -> 1150 bytes .../skins/default/textures/textures.xml | 6 +++++ .../xui/en/panel_profile_secondlife.xml | 24 +++++++++--------- 10 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png create mode 100644 indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index ce48ecad63..9c1c32d573 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -439,8 +439,11 @@ BOOL LLGroupListItem::postBuild() mProfileBtn = getChild("profile_btn"); mProfileBtn->setClickedCallback([this](LLUICtrl *, const LLSD &) { onProfileBtnClick(); }); - mVisibilityBtn = getChild("visibility_btn"); - mVisibilityBtn->setClickedCallback([this](LLUICtrl *, const LLSD &) { onVisibilityBtnClick(); }); + mVisibilityBtn = findChild("visibility_btn"); + if (mVisibilityBtn) + { + mVisibilityBtn->setClickedCallback([this](LLUICtrl *, const LLSD &) { onVisibilityBtnClick(); }); + } return TRUE; } @@ -460,7 +463,7 @@ void LLGroupListItem::onMouseEnter(S32 x, S32 y, MASK mask) { mInfoBtn->setVisible(true); mProfileBtn->setVisible(true); - if (mForAgent) + if (mForAgent && mVisibilityBtn) { mVisibilityBtn->setVisible(true); } @@ -473,8 +476,11 @@ void LLGroupListItem::onMouseLeave(S32 x, S32 y, MASK mask) { getChildView("hovered_icon")->setVisible( false); mInfoBtn->setVisible(false); - mVisibilityBtn->setVisible(false); mProfileBtn->setVisible(false); + if (mVisibilityBtn) + { + mVisibilityBtn->setVisible(false); + } LLPanel::onMouseLeave(x, y, mask); } diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index fb5d2d2051..7a28dd11f8 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -1614,6 +1614,10 @@ void LLPanelProfileSecondLife::onShowAgentPermissionsDialog() { floater->closeFloater(); } + + mSeeOnlineToggle->setFocus(false); + mSeeOnMapToggle->setFocus(false); + mEditObjectsToggle->setFocus(false); } void LLPanelProfileSecondLife::onOpenNotes() diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..8f8caa10d84d90e3b34c88804711d845a2f08317 GIT binary patch literal 1608 zcmV-O2DkZ%P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1>H$RK~zXf#a3HP zlt&akyNk*K-VpGPpxi1hLRj0Sr9xwbNMf64V+b`oknp16u`i8U`qZY+zEGQB(-Lh_ zh^qpDC>IeWU6DH|s8B(miin`7-1>d9`~TUn8=DprzhvOwnK?7(@||Y;5eW9%q<>gM&XgckW#2+}vF4 zrcIkhjd$kMw z26EcDNQv<9aG`SZ^YdyD>R22xSx`_A!0()#9BF81;HPu(=FOX_@UjF11V~R$&*$)g z1Jlm95IovwG|Hn#kLH6^3p z3^M%)W=VB*HTfsGxw*1-?OM5Y>y~oH@bK_&zP`S~p+UbHLPHxiZ1@Q`M0a<0hcz}f zs$lHiy}QO{vxQ;p(CgQ)N8Y@7b7%AB%}PdhSW!`ttXsEEcst{B zFDG}cs5eP=yWIvmXR&U=!GDtP8gyX|n&Y&ZM2Dd!e}n_(uxv<6OS3z7dJ*;p9#B?R z_947~AO1MuntqRov8bCD1CNVKOG}lL*;7by^kXB24dnU^2^NFlk8qD;Yul42Pp+Uk zx6q%MXAM;>)>6bBS{7^2v)LWw5lESa3y)vBcFl~T7`1Q!-L4I-w`uTTCNeRB&mzrbh@qON0x>Z$stY9~BnZ5s=GjcS zmkPk$v-Zxe0;p1 zVOOIF{y_q2F94E~1}ub!#cgeEd^cXi#myi@(&Xf%`Ps8)%H_??&B_CO2V-8P5ZzDm zk?}~m@NL_+<)GsJ4J+?(9Su`8jmXGI*9}g1u$r%m+1Xk3_+jnm%Ns9=czj!+c?1qK zE?D)HZX6jI=|Nn7Mrel7!IPnY5yOCN_!OSVg?9!(xL(&43X7_@ z?x0)2a64NHp4;EiV%L%ZZq9an>v(Uq`kh()U-6zU7WoJ00rw^QJ8F*r0000q)W@ctWLqmg9R8*+3v5_t>FG)c`;SLb? zJ_sxuXJ=<*ZEfx7@9&>JHa6y1Utdp4OG|WeazX&YUT|=5Tx@LYz|hc8(ZAS^4q6oTVa{@4JG60+spsd2(@ap}f32($v(X(a}*FA0HKs;sOuNJ>h2SzccLgG3^EysEvuy**ekw#*wL@`#8C0ovKwNhv8Q zR8mqx$;rtyH8n*hCMF^XnXtH8!Myefs&;sI_>Xxnu$7fna93BCP&THqv9VZhZEY2T z)78~QX{ounS*+XG*a%L~&(CRMVnSkXZ~qyTjjZM8y};Zywrgu^Bohf#jKQ1>VEm7D zOG`_!espvso(PiLi?p<~EYVIlBR}uunEO->02o(SSG2geNI^kC6c-mq>+9=6R9;?Q z6doQf&P-2F3s7W*5_3hgS!81EQQ~4g{!&+07g2&^lpUs`t*uQtIXS{0WG_X@CnqPx zIRwkq!rH;`@UYNT^%wtH5EpKX<%SL zMn*>W1G6KI^1;!7fB@mu0ESbcjb!8W^ppw<3x&{7f&Kk`iiwE<9Ru8o%P2c0&Ve%Q z-wVvDyk=kiDI+7}z{$x;2nL*^eb^+#nWCa1V*eIAGBw10E_$1t?Q>sW-!B1(Jp>JH z$i(_Vap6TREiKC|lnl-?zqGVe7d;FP%gV~Audk0rMn-N`58B8C;tdPxNTco12@nH8nMF?ojygLjMu?sm9*|3;<2~QV%T5iDCc%002ovPDHLkV1l2%V+Q~L literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..644edf0ef611607ca797b5c3636eb8daa1f820a2 GIT binary patch literal 1356 zcmV-S1+)5zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1mQ_UK~zXf#aCHK zV`mgTi5la+TjCgZ#pOj&u|+|xqDE>#L=anao`-=J`qVd{`cx===#$h|EKEm5TddR~ zi1oo8H7eu21#yX^#(g(E-=BNqWRmK1GITz;x%dA6f0qB8@0|ZeQCC+-ufi2SU0q$~ zjg1W|EiEM_2Jmuqbw$0sy_OZJsi_J-KR@%~;i1A#hw}FJ_GLpugBh0?Fq_S%VoHLG zmzURfMMXtV6$*uSSXdYd9iyY8#G+8Xy0^C%xwEsQxW2xow6rvfRemruHa2R<#>U9q z-JMvi+0)Y#;|k%YQmItqu2QM!^70ao7!!9pH($rS3xp2Xot>Rc>g(&n&VSJB^>>qz zk&$MO&x^&yMQUzte!@OjHjkgSwl?8ZK|uk$rh$P03|l5;93LN(i;Ii&CQZuQkbwXJ zVlq2BTalNS_fbGV09962K1U!he(zQu48(m9c>soohbby5>KhL4*UT3>Jv}8?SIabf zPDx3jtgI~K($bPHDJf|T<5tTzH#dg*`g$#rm!F@Hck1csA&o{uIXO8rK0Zz}Gc&{# zqpGSZu_v2QAxxk~cXziCWJ_c)7^tPCg^&O@H#cde1vbL}6;@#;XcW8iV{vh@pcUMf zfjx(Zhf{TR^+{%CW}!6fT(q4Mc52VoJWowciM=7W5fKsJa@4FMHb6=uq(Bqk>QH8L{th-<={7EY0d3wWZWqy&Ndesy*AOEJN)y3M4XURhar zG&eVAQx-mL@Yv!17wATg@sgGTl;KcV&Vfaz_4ucKD z+A8PwUOA8%85v^T`zs8mEIR``!#FN+3L-85f{p@1Uqs;5YBl#yzvAHF;Kw}e&L`H- zCX?w;UjGtnK*;m+b0GsAU;s))u3{NBWg!E`V1$(f`uqErgocKG&Pwz7OF_M`ut3|} z+rklmllO5*NC?Hn#Zhc*>=hgQdv|yD89Vd`J75%x9KdeJT(rM%SEyWHUsvJ$;SU7s zuDKIPs~iLCz;7<`kI0B==`U@9&c!2NCDR1%g!+8O^>fH zlmfoAz-W}nn>ZsA5f@0s-|VE*=^+0?T4IG=1K|=VL+1h`x#LH0^Z1mRTg_$hA%Ddw z_?uDu<$yz21E&H51JOM2nN1!Z9;591b0%LqpBzg#qXGGJkYQI&U@Z#^rBDv0Lb-hB zza<)u#3yX*GbWdckDgzTj*fogwrPOF*e#e1dAVIe&x3~lFT5vK6a520hK9Fd%&~0% O00001mz- literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png new file mode 100644 index 0000000000000000000000000000000000000000..629c05ecb83947b0ab424ce7ed867747d4f4f006 GIT binary patch literal 1137 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 Q(*OVf07*qoM6N<$f(Swnxc~qF literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index c02bef3a45..a4e9e2eb1b 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -508,6 +508,12 @@ with the same filename but different name + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index 3745706a5a..c63bf835ff 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -210,10 +210,10 @@ Account: [ACCTTYPE]