From 540493b315d8b8380b4c0bc63e7021ad499a62f8 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <andreylproductengine@lindenlab.com>
Date: Tue, 1 Sep 2015 23:16:58 +0300
Subject: MAINT-5297 Allow global toggle of 'View People Icons' - Chat window
 part

--HG--
branch : develop
---
 .../newview/skins/default/xui/en/menu_participant_view.xml  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 7ea87ee05c..658238bf41 100755
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -59,6 +59,19 @@
          function="IMFloaterContainer.Check"
          parameter="sort_participants_by_recent" />
     </menu_item_check>
+	<menu_item_separator
+     layout="topleft" />
+	<menu_item_check
+	 label="View people icons"
+	 layout="topleft"
+	 name="view_icons">
+		<on_click
+         function="IMFloaterContainer.Action"
+         parameter="view_icons" />
+		<on_check
+         function="IMFloaterContainer.Check"
+         parameter="view_icons" />
+	</menu_item_check>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-- 
cgit v1.2.3


From 70136a7e3d1ce1600ecc1b607923b6dd408b8d0e Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <andreylproductengine@lindenlab.com>
Date: Wed, 2 Sep 2015 01:16:18 +0300
Subject: MAINT-5297 Allow global toggle of 'View People Icons' - Global switch
 part

--HG--
branch : develop
---
 .../default/xui/en/menu_people_friends_view.xml    |  4 ++--
 .../default/xui/en/menu_people_nearby_view.xml     |  4 ++--
 .../default/xui/en/menu_people_recent_view.xml     |  4 ++--
 .../default/xui/en/panel_preferences_setup.xml     | 26 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

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>
-- 
cgit v1.2.3