summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_people_friends_view.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_people_nearby_view.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_people_recent_view.xml4
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_preferences_setup.xml26
4 files changed, 32 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index 8790fde7c5..02c6cfc006 100755
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -29,8 +29,8 @@
function="People.Friends.ViewSort.Action"
parameter="view_icons" />
<menu_item_check.on_check
- function="CheckControl"
- parameter="FriendsListShowIcons" />
+ function="People.Friends.ViewSort.CheckItem"
+ parameter="view_icons" />
</menu_item_check>
<menu_item_check name="view_permissions" label="View Permissions Granted">
<menu_item_check.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
index da88ca9f4d..44b3d14e10 100755
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -39,8 +39,8 @@
function="People.Nearby.ViewSort.Action"
parameter="view_icons" />
<menu_item_check.on_check
- function="CheckControl"
- parameter="NearbyListShowIcons" />
+ function="People.Nearby.ViewSort.CheckItem"
+ parameter="view_icons"/>
</menu_item_check>
<menu_item_check name ="view_map" label="View Map">
<menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
index 1dbc90dd2b..cd2260d0c4 100755
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -29,7 +29,7 @@
function="People.Recent.ViewSort.Action"
parameter="view_icons" />
<menu_item_check.on_check
- function="CheckControl"
- parameter="RecentListShowIcons" />
+ function="People.Recent.ViewSort.CheckItem"
+ parameter="view_icons" />
</menu_item_check>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index b201e071ef..a8be517f3c 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -313,4 +313,30 @@
<button.commit_callback
function="Pref.Proxy" />
</button>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left="30"
+ name="People Icons:"
+ mouse_opaque="false"
+ top_pad="5"
+ width="300">
+ People Icons:
+ </text>
+ <check_box
+ top_delta="4"
+ enabled="true"
+ follows="left|top"
+ height="14"
+ initial_value="false"
+ control_name="GlobalShowIconsOverride"
+ label="Hide people icons (global override)"
+ left_delta="50"
+ mouse_opaque="true"
+ name="global_show_icons_override"
+ width="400"
+ top_pad="10"/>
</panel>