merge

11 files changed, 20 insertions, 19 deletions

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index eee1134d15..a11ebf5af8 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -10,22 +10,16 @@
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="768"
+                height="749"
                 name="menu_stack"
                 orientation="vertical"
-                top="0">
+                top="19">
     <layout_panel auto_resize="false"
-                  height="84"
+                  height="65"
                   mouse_opaque="false"
-                  name="nav_and_status_bar_region"
+                  name="nav_bar_container"
                   width="1024"
                   visible="false">
-      <panel follows="left|right|bottom"
-             left="0"
-             name="nav_bar_container"
-             right="1024"
-             top="19"
-             height="65"/>
     </layout_panel>
     <layout_panel auto_resize="true"
                   follows="all"
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 c0e1944f56..9990324d03 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -9,5 +9,6 @@
     header_image_over="Accordion_Over"
     header_image_pressed="Accordion_Press"
     header_image_expanded="Accordion_Selected"
-    header_text_color="LtGray" 
+    header_text_color="LtGray"
+    font="SansSerif"
     />
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index 32916c0816..2be37d222a 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -15,4 +15,5 @@
 	track_bottom="true"
 	name="chat_history"
 	type="string"
-	word_wrap="true" />
\ No newline at end of file
+	word_wrap="true"
+  font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 5011bf6a61..e5af961a56 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <chiclet_script

- name="script_chiclet">

+ name="script_chiclet"

+ font="SansSerif">

  <icon

   name="chiclet_icon"

   follows="all"

diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 1425258b2a..b2bd9c38c9 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -9,6 +9,8 @@
  background_visible="true"
  background_opaque="false"
  header_height="25"
+         top="0"
+         left="0" 
  close_image="Icon_Close_Foreground"
  restore_image="Icon_Restore_Foreground"
  minimize_image="Icon_Minimize_Foreground"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
index 2bbaa6233f..c65244ae22 100644
--- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Use this for the top-level menu styling -->
-<menu_item>
-</menu_item>
+<menu_item font="SansSerif" />
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index dd848f3acd..3ddf18b2cb 100644
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<radio_item follows="left|top">
+<radio_item follows="left|top" font="SansSerif">
   <radio_item.label_text name="Radio Item label"/>
   <radio_item.check_button name="Radio control button"
                           image_unselected="RadioButton_Off"
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 706c89f5ed..89d5950e98 100644
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
@@ -8,4 +8,5 @@
             track_image_horizontal="SliderTrack_Horiz"
             track_image_vertical="SliderTrack_Vert"
             track_highlight_horizontal_image="SliderTrack_Horiz"
-            track_highlight_vertical_image="SliderTrack_Vert" />
+            track_highlight_vertical_image="SliderTrack_Vert"
+         font="SansSerif"  />
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index 7d1a5118cb..ab3f8df5f8 100644
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <spinner text_enabled_color="LabelTextColor"
          text_disabled_color="LabelDisabledColor"
+         font="SansSerif" 
          decimal_digits="3"
          label_width="40" >
   <spinner.up_button name="SpinCtrl Up"
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index 166e8555fe..f4dc192bc3 100644
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<textbase clip_partial="false"/>
+<textbase clip_partial="false"
+          font="SansSerif"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
index 2f72ad65a1..f4dbb8f404 100644
--- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- Global settings for all widgets ("UI Controls") -->
+<!-- The params in this file aren't currently getting loaded in OSX -->
 <ui_ctrl
-  font="SansSerif"
   />