livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15312 Added permission indicators

master
Andrey Kleshchev 2022-05-18 23:53:53 +03:00
parent de8a61f71a
commit 35a5fc74c0
10 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llgrouplist.cpp
View File

@ -439,8 +439,11 @@ BOOL LLGroupListItem::postBuild()
mProfileBtn = getChild<LLButton>("profile_btn");
mProfileBtn->setClickedCallback([this](LLUICtrl *, const LLSD &) { onProfileBtnClick(); });
mVisibilityBtn = getChild<LLButton>("visibility_btn");
mVisibilityBtn->setClickedCallback([this](LLUICtrl *, const LLSD &) { onVisibilityBtnClick(); });
mVisibilityBtn = findChild<LLButton>("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);
}

4
indra/newview/llpanelprofile.cpp
View File

@ -1614,6 +1614,10 @@ void LLPanelProfileSecondLife::onShowAgentPermissionsDialog()
{
floater->closeFloater();
}
mSeeOnlineToggle->setFocus(false);
mSeeOnMapToggle->setFocus(false);
mEditObjectsToggle->setFocus(false);
}
void LLPanelProfileSecondLife::onOpenNotes()

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

6
indra/newview/skins/default/textures/textures.xml
View File

@ -508,6 +508,12 @@ with the same filename but different name
<texture name="Profile_Search_Visibility_Dark" file_name="icons/Profile_Search_Visibility_Dark.png" preload="true"/>
<texture name="Profile_Search_Visibility_Light" file_name="icons/Profile_Search_Visibility_Light.png" preload="true"/>
<texture name="Profile_Perm_Find_Disabled" file_name="icons/Profile_Perm_Find_Disabled.png" preload="true"/>
<texture name="Profile_Perm_Find_Enabled" file_name="icons/Profile_Perm_Find_Enabled.png" preload="true"/>
<texture name="Profile_Perm_Objects_Disabled" file_name="icons/Profile_Perm_Objects_Disabled.png" preload="true"/>
<texture name="Profile_Perm_Objects_Enabled" file_name="icons/Profile_Perm_Objects_Enabled.png" preload="true"/>
<texture name="Profile_Perm_Online_Disabled" file_name="icons/Profile_Perm_Online_Disabled.png" preload="true"/>
<texture name="Profile_Perm_Online_Enabled" file_name="icons/Profile_Perm_Online_Enabled.png" preload="true"/>
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />

24
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -210,10 +210,10 @@ Account: [ACCTTYPE]
<button
name="allow_to_see_online"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Command_Speak_Icon"
image_selected="Toolbar_Middle_Selected"
image_unselected="Generic_Person_Large"
image_pressed="Profile_Perm_Online_Disabled"
image_pressed_selected="Profile_Perm_Online_Enabled"
image_unselected="Profile_Perm_Online_Disabled"
image_selected="Profile_Perm_Online_Enabled"
layout="topleft"
follows="left|top"
top="0"
@ -223,10 +223,10 @@ Account: [ACCTTYPE]
<button
name="allow_to_see_on_map"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Command_Speak_Icon"
image_selected="Toolbar_Middle_Selected"
image_unselected="Generic_Person_Large"
image_pressed="Profile_Perm_Find_Disabled"
image_pressed_selected="Profile_Perm_Find_Enabled"
image_unselected="Profile_Perm_Find_Disabled"
image_selected="Profile_Perm_Find_Enabled"
layout="topleft"
follows="left|top"
top_pad="7"
@ -236,10 +236,10 @@ Account: [ACCTTYPE]
<button
name="allow_edit_my_objects"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="Command_Speak_Icon"
image_selected="Toolbar_Middle_Selected"
image_unselected="Generic_Person_Large"
image_pressed="Profile_Perm_Objects_Disabled"
image_pressed_selected="Profile_Perm_Objects_Enabled"
image_unselected="Profile_Perm_Objects_Disabled"
image_selected="Profile_Perm_Objects_Enabled"
layout="topleft"
follows="left|top"
top_pad="7"