MAINT-5297 Backed out changeset: dd9e3cbf10e5

4 files changed, 6 insertions, 32 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 02c6cfc006..8790fde7c5 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="People.Friends.ViewSort.CheckItem"
-     parameter="view_icons" />
+     function="CheckControl"
+     parameter="FriendsListShowIcons" />
   </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 44b3d14e10..da88ca9f4d 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="People.Nearby.ViewSort.CheckItem"
-         parameter="view_icons"/>
+         function="CheckControl"
+         parameter="NearbyListShowIcons" />
     </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 cd2260d0c4..1dbc90dd2b 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="People.Recent.ViewSort.CheckItem"
-     parameter="view_icons" />
+     function="CheckControl"
+     parameter="RecentListShowIcons" />
   </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 a8be517f3c..b201e071ef 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -313,30 +313,4 @@
 		<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>