summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llgrouplist.cpp14
-rw-r--r--indra/newview/llpanelprofile.cpp4
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.pngbin0 -> 1608 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.pngbin0 -> 1287 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.pngbin0 -> 1356 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.pngbin0 -> 1137 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.pngbin0 -> 1312 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.pngbin0 -> 1150 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_secondlife.xml24
10 files changed, 32 insertions, 16 deletions
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<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);
}
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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Disabled.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Find_Enabled.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Disabled.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Objects_Enabled.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Disabled.png
Binary files 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
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Perm_Online_Enabled.png
Binary files 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
<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" />
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]
<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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:24:46 +0000