From 35a5fc74c0df29b496d42e89845d00a366034b68 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 18 May 2022 23:53:53 +0300 Subject: SL-15312 Added permission indicators --- indra/newview/llgrouplist.cpp | 14 ++++++++---- indra/newview/llpanelprofile.cpp | 4 ++++ .../textures/icons/Profile_Perm_Find_Disabled.png | Bin 0 -> 1608 bytes .../textures/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 .../textures/icons/Profile_Perm_Online_Enabled.png | Bin 0 -> 1150 bytes indra/newview/skins/default/textures/textures.xml | 6 ++++++ .../default/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 (limited to 'indra/newview') 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 0000000000..8f8caa10d8 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png differ diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png new file mode 100644 index 0000000000..42a209dda5 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png differ 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 0000000000..644edf0ef6 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png differ 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 0000000000..629c05ecb8 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png differ diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png new file mode 100644 index 0000000000..ecf66c0ee1 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png differ diff --git a/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png new file mode 100644 index 0000000000..26123938fa Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png differ 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]