Merge

7 files changed, 28 insertions, 42 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 4f1024f56d..8bfd64b3df 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2093,7 +2093,6 @@ Texture:
              width="195" />
             <button
              follows="bottom"
-             font="SansSerifSmall"
              height="16"
              label="Add..."
              label_selected="Add..."
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index e3751f2bd9..06c766f744 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -42,7 +42,6 @@
     </scroll_list>
     <button
      height="23"
-     font="SansSerif"
      label="Teleport"
      label_selected="Teleport"
      layout="topleft"
@@ -53,7 +52,6 @@
      width="80" />
     <button
      height="23"
-     font="SansSerif"
      label="Map"
      label_selected="Map"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 4f3978a5e3..8cc2c91ef5 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -173,7 +173,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Add &gt;&gt;"
      layout="topleft"
      left_pad="10"
@@ -205,7 +204,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Up"
      layout="topleft"
      left_pad="10"
@@ -215,7 +213,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Down"
      layout="topleft"
      left_delta="0"
@@ -225,7 +222,6 @@
     <button
      follows="top|left"
      height="20"
-     font="SansSerifSmall"
      label="Remove"
      layout="topleft"
      left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
index 07c684d904..b5f2abf52a 100644
--- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
@@ -71,7 +71,6 @@
   </text>
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Map"
    left="10"
@@ -80,7 +79,6 @@
    width="75" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Block"
    left_pad="5"
@@ -89,7 +87,6 @@
    width="75" />
   <button
    follows="top|left"
-   font="SansSerif"
    height="20"
    label="Close"
    right="-10"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e19e11a1b8..75d8ea6697 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -373,17 +373,17 @@
                 <menu_item_call.on_enable
                  function="World.EnableSetHomeLocation" />
             </menu_item_call>
-            <menu_item_call
-             label="Teleport Home"
-             layout="topleft"
-             name="Teleport Home"
-             shortcut="control|shift|H">
-                <menu_item_call.on_click
-                 function="World.TeleportHome" />
-                <menu_item_call.on_enable
-                 function="World.EnableTeleportHome" />
-            </menu_item_call>
         </menu>
+	    <menu_item_call
+	     label="Home"
+	     layout="topleft"
+	     name="Teleport Home"
+	     shortcut="control|shift|H">
+		<menu_item_call.on_click
+		 function="World.TeleportHome" />
+		<menu_item_call.on_enable
+		 function="World.EnableTeleportHome" />
+	    </menu_item_call>
       <menu_item_check
          label="Mini-Map"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index ee333be0cb..b881719e3a 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -12,24 +12,24 @@
      follows="all"
      height="85"
      image_name="ListItem_Over"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="hovered_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308"/>
     <icon
      follows="all"
      height="85"
      image_name="ListItem_Select"
-     right="-3"
+     right="-2"
      mouse_opaque="false"
      name="selected_icon"
      top="1"
      scale_image="true"
      visible="false"
-     width="307"/>
+     width="308"/>
     <texture_picker
      allow_no_texture="true"
      border_enabled="true"
@@ -47,37 +47,34 @@
      width="90" />
     <text
      follows="top|left|right"
-     font="SansSerifSmallBold"
-     height="16"
+     font="SansSerifSmall"
+     height="15"
      layout="topleft"
      left="110"
      name="name"
      text_color="white"
      top="9"
-     use_ellipses="false"
-     width="197"
+     use_ellipses="true"
+     width="193"
      word_wrap="false" />
     <expandable_text
      follows="top|left|right"
      font="SansSerifSmall"
-     height="40"
+     height="55"
      layout="topleft"
-     left="110"
+     left="103"
      name="description"
-     top_pad="3"
+     top_pad="0"
      width="178"
      word_wrap="true" />
     <button
-     follows="top|right"
-     height="16"
-     image_selected="BuyArrow_Press"
-     image_pressed="BuyArrow_Press"
-     image_unselected="BuyArrow_Press"
+     follows="right"
+     height="20"
+     image_overlay="ForwardArrow_Off"
      layout="topleft"
+     left_pad="5"
+     right="-8"
      name="info_chevron"
-     picture_style="true"
-     right="-7"
-     tab_stop="false"
-     top="27"
-     width="16" />
+     top_delta="15"
+     width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 0ac0521b10..6a61953319 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -319,7 +319,6 @@ Avatars:
      bottom_delta="0"
      enabled_control="EnableVoiceChat"
      follows="left"
-     font="SansSerif"
      halign="center"
      height="20"
      label="Middle Mouse Button"