merge from PE's viewer-release

9 files changed, 23 insertions, 65 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 3225843d09..f25c170f33 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -5,7 +5,6 @@
  height="200"
  layout="topleft"
  name="publish_classified"
- help_topic="price_for_listing"
  title="Publishing Classified"
  width="320">
     <text
@@ -29,8 +28,8 @@ Remember, Classified fees are non-refundable.
      halign="left"
      height="23"
      increment="1"
-     label_width="70"
-     label="Price for Ad: "
+     label_width="45"
+     label="Price: L$ "
      v_pad="10"
      layout="topleft"
      left="15"
@@ -41,27 +40,6 @@ Remember, Classified fees are non-refundable.
      top_pad="10"
      tool_tip="Price for listing."
      width="150" />
-    <text
-     follows="top|left"
-     font="SansSerif"
-     height="60"
-     layout="topleft"
-     left_pad="5"
-     top_delta="0"
-     word_wrap="true"
-     value="L$"
-     name="l$_text" />
-    <text
-     follows="top|right"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="15"
-     name="more_info_text"
-     top_pad="-20"
-     width="300">
-More info (link to classified help)
-    </text>
     <button
      follows="top|left"
      height="22"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 6ca8766e3f..397e61c97a 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -18,7 +18,7 @@
      name="Edit...">
         <menu_item_call.on_click
          function="Object.Edit" />
-    <menu_item_call.on_visible
+    <menu_item_call.on_enable
          function="EnableEdit"/>
     </menu_item_call>
     <menu_item_call
@@ -26,7 +26,7 @@
       name="Build">
       <menu_item_call.on_click
         function="Object.Build" />
-        <menu_item_call.on_visible
+        <menu_item_call.on_enable
          function="EnableEdit"/>
     </menu_item_call>
    <menu_item_call
@@ -44,7 +44,7 @@
      name="Object Sit">
         <menu_item_call.on_click
          function="Object.SitOrStand" />
-        <menu_item_call.on_visible
+        <menu_item_call.on_enable
          function="Object.SitVisible" />
         <menu_item_call.on_enable
          function="Object.EnableSitOrStand"
@@ -56,7 +56,7 @@
      name="Object Stand Up">
         <menu_item_call.on_click
          function="Object.SitOrStand" />
-        <menu_item_call.on_visible
+        <menu_item_call.on_enable
          function="Object.StandUpVisible" />
         <menu_item_call.on_enable
          function="Object.EnableSitOrStand"
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index c4c7a5034a..732b8a788d 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu
  layout="topleft"
+ visible="false"
  name="Gear Outfit">
     <menu_item_call
      label="Wear - Replace Current Outfit"
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
index 84431a2f69..747352cb29 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu
  layout="topleft"
+ visible="false"
  name="Gear Wearing">
     <menu_item_call
      label="Edit Outfit"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 3f41973b72..cbdd548577 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -253,35 +253,6 @@
                  width="20"/>
             </icons_combo_box.item>
         </icons_combo_box>
-        <text
-         follows="left|top"
-         font.style="BOLD"
-         height="10"
-         layout="topleft"
-         left="10"
-         name="price_for_listing_label"
-         text_color="white"
-         top_pad="15"
-         value="Price for listing:"
-         width="250" />
-        <spinner
-         decimal_digits="0"
-         follows="left|top"
-         halign="left"
-         height="23"
-         increment="1"
-         label_width="20"
-         label="L$"
-         v_pad="10"
-         layout="topleft"
-         left="10"
-         value="50"
-         min_val="50"
-         max_val="99999"
-         name="price_for_listing"
-         top_pad="5"
-         tool_tip="Price for listing."
-         width="105" />
         <check_box
          height="16"
          label="Auto renew each week"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 58d3dbcc37..82b69ba8dc 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -12,13 +12,21 @@
  min_width="240"
  width="320"
  border="false">
+   <panel.string
+     name="wear_outfit_tooltip">
+     Wear selected outfit
+   </panel.string>
+   <panel.string
+     name="wear_items_tooltip">
+     Wear selected items
+   </panel.string>
    <tab_container
      follows="all"
      height="539"
      layout="topleft"
      left="5"
      name="appearance_tabs"
-     tab_min_width="140"
+     tab_min_width="150"
      tab_height="30"
      tab_position="top"
      halign="center"
@@ -89,7 +97,6 @@
           layout="topleft"
           name="wear_btn"
           left_pad="3"
-          tool_tip="Wear selected outfit"
           width="152" />
    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 9a07d3a48a..10d8c7dbb8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -61,7 +61,7 @@ width="333">
       top="0"
       width="32" />
       <text
-      font="SansSerifSmallBold"
+      font="SansSerifSmall"
       text_color="EmphasisColor"
       width="300"
       height="10"
@@ -89,15 +89,15 @@ width="333">
       </text>
       <button
       follows="left|top"
-      height="23"
+      height="28"
       image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
       left="265"
       name="edit_outfit_btn"
       tool_tip="Edit this outfit"
-      top="7"
-      width="30" />
+      top="3"
+      width="28" />
       <loading_indicator
       follows="left|top"
       height="24"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 799d440292..f7611b6833 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1939,7 +1939,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string>
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
-	<string name="InvFolder favorite">Favorites</string>
+	<string name="InvFolder Favorite">Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 102dc0c16d..6f68c99021 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -9,6 +9,6 @@
     header_image_over="Accordion_Over"
     header_image_pressed="Accordion_Press"
     header_image_focused="Accordion_Selected"
-    header_text_color="LtGray"
+    header_text_color="AccordionHeaderTextColor"
     font="SansSerif"
     />