From 3c637e49452229e8df3cce833a275daaef650d9c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 17 Mar 2017 10:18:31 +0200
Subject: MAINT-7215 Add "+" button next to filter editor in Avatar rendering
 settings floater

---
 .../xui/en/floater_avatar_render_settings.xml       | 21 ++++++++++++++++-----
 .../xui/en/menu_avatar_rendering_settings_add.xml   | 18 ++++++++++++++++++
 .../default/xui/en/panel_preferences_graphics1.xml  |  2 --
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
index dd37e329e5..03e812d36d 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_render_settings.xml
@@ -23,22 +23,33 @@
      height="23"
      layout="topleft"
      left="8"
-     right="-8"
+     right="-47"
      label="Filter People"
      max_length_chars="300"
      name="people_filter_input"
      text_color="Black"
      text_pad_left="10"
      top="4" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="AddItem_Off"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="7"
+     menu_filename="menu_avatar_rendering_settings_add.xml"
+     menu_position="bottomleft"
+     name="plus_btn"
+     tool_tip="Actions on selected person"
+     top="3"
+     width="31" />
     <name_list
-     allow_select="true"
      bottom="-8"
      draw_heading="true"
-     opaque="true"
      follows="all"
      left="8"
-     keep_selection_visible_on_reshape="true"
-     item_pad="2"
      multi_select="false"
      name="render_settings_list"
      right="-8"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
new file mode 100644
index 0000000000..c64b24ed70
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_avatar_rendering_settings_add.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_settings_add.xml"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Always Render a Resident..."
+   name="add_avatar_always_render">
+      <on_click
+       function="Settings.AddNewEntry" parameter="always"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Never Render a Resident..."
+   name="add_avatar_never_render">
+      <on_click
+       function="Settings.AddNewEntry"  parameter="never"/>
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 652b7fd029..4692a226d9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -303,8 +303,6 @@
     name="AlwaysRenderFriends"
     top_delta="24"
     width="256">
-    <check_box.commit_callback
-      function="Pref.RenderFriends" />
   </check_box>
   <button
     height="23"
-- 
cgit v1.2.3