merge from PE's viewer-trunk

4 files changed, 18 insertions, 38 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 41bcc62220..84a99ba92a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -522,8 +522,6 @@ with the same filename but different name
   <!--WARNING OLD ART BELOW *do not use*-->
   <texture name="icn_media_web.tga" preload="true" />
   <texture name="icn_media_movie.tga" preload="true" />
-  <texture name="icn_speaker-muted_dark.tga" />
-  <texture name="icn_speaker_dark.tga" />
   <texture name="icn_voice-localchat.tga" />
   <texture name="icn_voice-groupfocus.tga" />
   <texture name="icn_voice-pvtfocus.tga" />
@@ -545,10 +543,6 @@ with the same filename but different name
   <texture name="tearoffbox.tga" />
   <texture name="tearoff_pressed.tga" />
 
-  <texture name="icn_label_music.tga" />
-  <texture name="icn_label_media.tga" />
-  <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114" />
-
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
@@ -582,20 +576,6 @@ with the same filename but different name
 
   <texture name="notify_caution_icon.tga" />
 
-  <texture name="icn_active-speakers-dot-lvl0.tga" />
-  <texture name="icn_active-speakers-dot-lvl1.tga" />
-  <texture name="icn_active-speakers-dot-lvl2.tga" />
-
-  <texture name="icn_voice_ptt-off.tga" />
-  <texture name="icn_voice_ptt-on.tga" />
-  <texture name="icn_voice_ptt-on-lvl1.tga" />
-  <texture name="icn_voice_ptt-on-lvl2.tga" />
-  <texture name="icn_voice_ptt-on-lvl3.tga" />
-  <texture name="icn_voice-call-end.tga" />
-  <texture name="icn_voice-call-start.tga" />
-
-  <texture name="mute_icon.tga" />
-
   <texture name="default_land_picture.j2c" />
   <texture name="default_profile_picture.j2c" />
   <texture name="locked_image.j2c" />
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 2c97112e38..8b10c7b049 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -138,26 +138,13 @@
     </context_menu>
    <menu_item_separator layout="topleft" />
    <menu_item_call
-    label="Buy"
-    layout="topleft"
-    name="Pie Object Bye">
-      <menu_item_call.on_click
-       function="Tools.BuyOrTake"/>
-      <menu_item_call.on_visible
-       function="Tools.VisibleBuyObject"/>
-      <menu_item_call.on_enable
-       function="Tools.EnableBuyOrTake"/>
-   </menu_item_call>
-   <menu_item_call
      label="Take"
      layout="topleft"
      name="Pie Object Take">
       <menu_item_call.on_click
-       function="Tools.BuyOrTake"/>
-      <menu_item_call.on_visible
-       function="Tools.VisibleTakeObject"/>
+       function="Object.Take"/>
       <menu_item_call.on_enable
-       function="Tools.EnableBuyOrTake"/>
+       function="Object.VisibleTake"/>
    </menu_item_call>
    <menu_item_call
    enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index d03a7e3d41..59c7f4ed85 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -82,8 +82,21 @@
          function="ParticipantList.EnableItem"
          parameter="can_pay" />
     </menu_item_call>
-        <menu_item_separator
-         layout="topleft" />
+    <menu_item_separator
+        layout="topleft"
+        name="View Icons Separator" />
+    <menu_item_check
+        label="View People Icons"
+        name="View Icons">
+      <on_click
+          function="ToggleControl"
+          parameter="ParticipantListShowIcons"/>
+      <on_check
+          function="CheckControl"
+          parameter="ParticipantListShowIcons" />
+    </menu_item_check>
+    <menu_item_separator
+        layout="topleft" />
     <menu_item_check
      label="Block Voice"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index a5e6506463..9ece4aead8 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -211,7 +211,7 @@
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 name="trash_btn"
+                 name="remove_from_outfit_btn"
                  right="-1"
                  top="1"
                  width="31" />