Merge with recent viewer-2-0

3 files changed, 16 insertions, 9 deletions

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 08c337455c..c0e1944f56 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <accordion_tab
-    font="SansSerifBold"
     header_bg_color="DkGray2"
     header_collapse_img="Accordion_ArrowClosed_Off"
     header_collapse_img_pressed="Accordion_ArrowClosed_Press"
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 90887dead6..d32952b04f 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -11,7 +11,7 @@
                 add_landmark_image_disabled="Favorite_Star_Off"
                 add_landmark_image_hover="Favorite_Star_Over"
                 add_landmark_image_selected="Favorite_Star_Press"
-				add_landmark_hpad="10"
+				add_landmark_hpad="12"
                 icon_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
@@ -42,6 +42,7 @@
   <for_sale_button
     name="for_sale_btn"
     image_unselected="parcel_lght_ForSale"
+    image_selected="parcel_lght_ForSale"
     width="22"
     height="18"
     follows="right|top"
@@ -52,35 +53,40 @@
     name="voice_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_VoiceNo"
     />
   <fly_icon
     name="fly_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_FlyNo"
     />
   <push_icon
     name="push_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_PushNo"
     />
   <build_icon
     name="build_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_BuildNo"
     />
   <scripts_icon
     name="scripts_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_ScriptsNo"
     />
   <!-- NOTE: Placeholder icon, there is no dark grayscale version -->
@@ -88,7 +94,8 @@
     name="damage_icon"
     width="22"
     height="18"
-	top="21"
+    top="21"
+    follows="right|top"
     image_name="parcel_lght_Damage"
     />
   <!-- Default text color is invisible on top of nav bar background -->
@@ -97,6 +104,7 @@
 	width="35"
 	height="18"
 	top="16"
+    follows="right|top"
 	halign="right"
 	font="SansSerifSmall"
 	text_color="TextFgColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index 6dd92ea34b..166e8555fe 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<textbase/>
+<textbase clip_partial="false"/>