From 970ee73e9a9cd1c94c295c9decb4d632886c19e6 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 25 Oct 2013 11:48:43 -0700
Subject: Fix release merge issues (included upstream changes not yet in
 release from bear)

---
 indra/newview/skins/default/textures/textures.xml  |  1 -
 .../skins/default/xui/en/menu_avatar_icon.xml      | 70 +---------------------
 .../skins/default/xui/en/panel_navigation_bar.xml  |  3 -
 indra/newview/skins/default/xui/en/strings.xml     |  2 -
 .../skins/default/xui/en/widgets/tab_container.xml | 12 +---
 5 files changed, 6 insertions(+), 82 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f4a7c437ea..94c187e21a 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -153,7 +153,6 @@ with the same filename but different name
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
-  <texture name="Command_Highlighting_Icon" file_name="toolbar_icons/highlighting.png" preload="true" />
   <texture name="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />
   <texture name="Caret_Right_Icon"          file_name="toolbar_icons/caret_right.png"  preload="true" scale.left="5" scale.top="15" scale.right="28" scale.bottom="1" />
   <texture name="Caret_Left_Icon"           file_name="toolbar_icons/caret_left.png"   preload="true" scale.left="1" scale.top="15" scale.right="23" scale.bottom="1" />
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 77b9095f7c..50910dff32 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -17,7 +17,7 @@
          parameter="profile" />
     </menu_item_call>
     <menu_item_call
-     label="IM"
+     label="Send IM..."
      layout="topleft"
      name="Send IM">
         <menu_item_call.on_click
@@ -25,26 +25,7 @@
          parameter="im" />
     </menu_item_call>
     <menu_item_call
-     label="Offer teleport"
-     layout="topleft"
-     name="Offer Teleport">
-        <on_click function="AvatarIcon.Action" parameter="teleport"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Voice call"
-     layout="topleft"
-     name="Voice Call">
-        <on_click function="AvatarIcon.Action" parameter="voice_call"/>
-    </menu_item_call>
-    <menu_item_call
-     label="Chat history..."
-     layout="topleft"
-     name="Chat History">
-        <on_click function="AvatarIcon.Action" parameter="chat_history"/>   
-    </menu_item_call>
-    <menu_item_separator layout="topleft" name="separator_chat_history"/>
-    <menu_item_call
-     label="Add friend"
+     label="Add Friend..."
      layout="topleft"
      name="Add Friend">
         <menu_item_call.on_click
@@ -52,56 +33,11 @@
          parameter="add" />
     </menu_item_call>
     <menu_item_call
-     label="Remove friend"
+     label="Remove Friend..."
      layout="topleft"
      name="Remove Friend">
         <menu_item_call.on_click
          function="AvatarIcon.Action"
          parameter="remove" />
     </menu_item_call>
-    <menu_item_call
-     label="Invite to group..."
-     layout="topleft"
-     name="Invite Group">
-      <on_click function="AvatarIcon.Action" parameter="invite_to_group" />   
-    </menu_item_call>
-    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
-    <menu_item_call
-     label="Zoom In"
-     layout="topleft"
-     name="Zoom In">
-      <on_click function="AvatarIcon.Action" parameter="zoom_in" />
-    </menu_item_call>
-    <menu_item_call
-     label="Map"
-     layout="topleft"
-     name="Map">
-       <on_click function="AvatarIcon.Action" parameter="map" />
-    </menu_item_call>
-    <menu_item_call
-     label="Share"
-     layout="topleft"
-     name="Share">
-       <on_click function="AvatarIcon.Action" parameter="share" />
-    </menu_item_call>
-    <menu_item_call
-     label="Pay"
-     layout="topleft"
-     name="Pay">
-       <on_click function="AvatarIcon.Action" parameter="pay" />
-    </menu_item_call>
-    <menu_item_check
-     label="Block Voice"
-     layout="topleft"
-     name="Block Unblock">
-       <on_click function="AvatarIcon.Action" parameter="block_unblock" />
-       <on_check function="AvatarIcon.Check" parameter="is_blocked" />
-    </menu_item_check>
-    <menu_item_check
-     label="Block Text"
-     layout="topleft"
-     name="Mute Text">
-       <on_click function="AvatarIcon.Action" parameter="mute_unmute" />
-       <on_check function="AvatarIcon.Check" parameter="is_muted" />   
-  </menu_item_check>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index c7edba21f8..3edeb9aa36 100755
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -87,7 +87,6 @@
 	         direction="down"
 	         height="23"
 	         image_overlay="Arrow_Left_Off"
-	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
 	         left="10"
@@ -100,7 +99,6 @@
 	         direction="down"
 	         height="23"
 	         image_overlay="Arrow_Right_Off"
-	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
 	         left_pad="0"
@@ -113,7 +111,6 @@
 	         height="23"
 	         image_bottom_pad="1"
 	         image_overlay="Home_Off"
-	         image_hover_unselected="PushButton_Over"
 	         layout="topleft"
 	         left_pad="7"
 	         name="home_btn"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7e79d297ef..8ac95beddb 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -456,8 +456,6 @@ Please try logging in again in a minute.</string>
 	<string name="load_file_verb">Load</string>
 	<string name="targa_image_files">Targa Images</string>
 	<string name="bitmap_image_files">Bitmap Images</string>
-	<string name="png_image_files">PNG Images</string>
-	<string name="save_texture_image_files">Targa or PNG Images</string>
 	<string name="avi_movie_file">AVI Movie File</string>
 	<string name="xaf_animation_file">XAF Anim File</string>
 	<string name="xml_file">XML File</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 9559be214a..20acea57ea 100755
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -25,25 +25,19 @@ label_pad_left - padding to the left of tab button labels
                tab_bottom_image_selected="Toolbar_Left_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
                tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
-               tab_top_image_hovered="TabTop_Left_Selected"
-               tab_button_image_hovered="Toolbar_Left_Selected"
-               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
+/>
   <middle_tab tab_top_image_unselected="TabTop_Middle_Off"
                tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="Toolbar_Middle_Off"
                tab_bottom_image_selected="Toolbar_Middle_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
                tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
-               tab_top_image_hovered="TabTop_Middle_Selected"
-               tab_button_image_hovered="Toolbar_Middle_Selected"
-               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
+/>
   <last_tab tab_top_image_unselected="TabTop_Right_Off"
                tab_top_image_selected="TabTop_Right_Selected"
                tab_bottom_image_unselected="Toolbar_Right_Off"
                tab_bottom_image_selected="Toolbar_Right_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
                tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
-               tab_top_image_hovered="TabTop_Right_Selected"
-               tab_button_image_hovered="Toolbar_Right_Selected"
-               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
+/>
 </tab_container>
-- 
cgit v1.2.3