From ade89007a89575ca0d3563a1aa08c7d20e30fcce Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 12 Mar 2012 13:27:01 -0700
Subject: sync with viewer-development

---
 indra/newview/skins/default/xui/en/floater_aaa.xml | 158 +++---
 .../skins/default/xui/en/floater_about_land.xml    |  22 +-
 .../xui/en/floater_animation_anim_preview.xml      |  76 +++
 .../xui/en/floater_animation_bvh_preview.xml       | 573 +++++++++++++++++++++
 .../default/xui/en/floater_animation_preview.xml   | 573 ---------------------
 .../skins/default/xui/en/floater_build_options.xml |  61 +--
 .../skins/default/xui/en/floater_buy_contents.xml  |   2 +-
 .../skins/default/xui/en/floater_buy_currency.xml  |   8 +-
 .../skins/default/xui/en/floater_buy_object.xml    |   4 +-
 .../skins/default/xui/en/floater_choose_group.xml  |   2 +-
 .../skins/default/xui/en/floater_fast_timers.xml   |   1 -
 .../default/xui/en/floater_merchant_outbox.xml     |   6 +-
 .../skins/default/xui/en/floater_model_preview.xml |  86 ++--
 .../skins/default/xui/en/floater_preferences.xml   |   2 +-
 .../default/xui/en/floater_preview_animation.xml   |  16 +-
 .../default/xui/en/floater_test_layout_stacks.xml  |  20 +
 .../xui/en/floater_test_text_vertical_aligment.xml | 112 ++++
 .../skins/default/xui/en/floater_test_textbox.xml  |  16 +-
 .../newview/skins/default/xui/en/floater_tools.xml |  62 ++-
 .../skins/default/xui/en/floater_toybox.xml        |   4 +-
 .../default/xui/en/floater_voice_controls.xml      |   2 +-
 .../skins/default/xui/en/inspect_object.xml        |   3 +-
 .../newview/skins/default/xui/en/notifications.xml |  10 +-
 .../default/xui/en/panel_block_list_sidetray.xml   |   2 +-
 .../skins/default/xui/en/panel_chat_header.xml     |   6 +-
 .../skins/default/xui/en/panel_chat_item.xml       |   4 +-
 .../xui/en/panel_dummy_clothing_list_item.xml      |   2 +-
 .../skins/default/xui/en/panel_edit_wearable.xml   |   6 +-
 .../skins/default/xui/en/panel_group_roles.xml     |   2 +-
 .../skins/default/xui/en/panel_inbox_inventory.xml |   1 +
 .../skins/default/xui/en/panel_instant_message.xml |   6 +-
 .../skins/default/xui/en/panel_landmark_info.xml   |   4 +-
 .../skins/default/xui/en/panel_main_inventory.xml  |   1 -
 .../skins/default/xui/en/panel_navigation_bar.xml  |  15 +-
 .../skins/default/xui/en/panel_nearby_chat.xml     |  84 ++-
 .../skins/default/xui/en/panel_notification.xml    |  18 +-
 .../default/xui/en/panel_online_status_toast.xml   |   2 +-
 .../default/xui/en/panel_preferences_general.xml   |   6 +-
 .../default/xui/en/panel_preferences_sound.xml     |   2 +-
 .../skins/default/xui/en/panel_status_bar.xml      |   2 -
 .../skins/default/xui/en/panel_sys_well_item.xml   |   4 +-
 .../default/xui/en/panel_teleport_history_item.xml |   2 +-
 indra/newview/skins/default/xui/en/panel_toast.xml |   2 +-
 .../skins/default/xui/en/sidepanel_inventory.xml   |   3 +-
 indra/newview/skins/default/xui/en/strings.xml     |   4 +
 .../default/xui/en/widgets/avatar_list_item.xml    |   8 +-
 .../default/xui/en/widgets/bodyparts_list_item.xml |   2 +-
 .../skins/default/xui/en/widgets/button.xml        |   2 +-
 .../skins/default/xui/en/widgets/check_box.xml     |   2 +-
 .../default/xui/en/widgets/clothing_list_item.xml  |   2 +-
 .../xui/en/widgets/dummy_clothing_list_item.xml    |   2 +-
 .../skins/default/xui/en/widgets/tab_container.xml |   2 +-
 52 files changed, 1136 insertions(+), 881 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_animation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 930bbaa8cb..d11373ce1d 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  can_minimize="false"
  can_tear_off="false"
  can_resize="true"
@@ -16,67 +15,98 @@
  save_dock_state="true"
  save_visibility="true"
  single_instance="true" 
- width="320">
-  <string name="nudge_parabuild" translate="false">Nudge 1</string>
-  <string name="test_the_vlt">This string CHANGE2 is extracted.</string>
-  <string name="testing_eli">Just a test. changes.</string>
-  <text_editor
-   parse_urls="true"
-   bg_readonly_color="ChatHistoryBgColor"
-   bg_writeable_color="ChatHistoryBgColor" 
-   border_visible="false"
-   follows="all"
-   font="SansSerif" 
-	 left="1"
-   top="20"
-   layout="topleft"
-	 height="260"
-   name="chat_history"
-   max_length="200000" 
-   parse_highlights="true"
-   text_color="ChatHistoryTextColor"
-   text_readonly_color="ChatHistoryTextColor"
-   translate="false"
-   track_end="true" 
-   wrap="true" 
-   width="320">
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    Really long line that is long enough to wrap once with jyg descenders.
-    </text_editor>
+ width="650">
+  <text left="0"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"        
+        bottom="-5"
+        width="100"
+        valign="top">
+this
+is
+some
+text
+that
+is
+top
+aligned</text>
+  <text left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        bottom="-5"
+        clip_partial="true"
+        width="100"
+        valign="center">
+this
+is
+some
+text
+that
+is
+center
+aligned</text>
+  <text left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"        
+        bottom="-5"
+        width="100"
+        valign="bottom">
+this
+is
+some
+text
+that
+is
+bottom
+aligned</text>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"
+        bottom="-5"
+        width="100"
+        valign="top">
+this
+is
+some
+text
+that
+is
+top
+aligned
+  </text_editor>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        bottom="-5"
+        clip_partial="true"
+        width="100"
+        valign="center">
+this
+is
+some
+text
+that
+is
+center
+aligned
+  </text_editor>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"
+        bottom="-5"
+        width="100"
+        valign="bottom">
+this
+is
+some
+text
+that
+is
+bottom
+aligned
+  </text_editor>
 </floater>
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 1d5a6740b7..3a6c2678c1 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -192,12 +192,12 @@
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="18"
              layout="topleft"
              left_pad="2"
              valign="center" 
              name="ContentRatingText"
-             top_delta="0"
+             top_delta="-2"
              width="250">
                 Adult
             </text>
@@ -209,7 +209,7 @@
              layout="topleft"
              left="10"
              name="Owner:"
-             top_pad="1"
+             top_pad="3"
              width="100">
                 Owner:
             </text>
@@ -736,7 +736,7 @@
              height="16"
              layout="topleft"
              left_pad="10"
-             top_delta="-3" 
+             top_delta="-1" 
              mouse_opaque="false"
              name="region_maturity_text"
              valign="center" 
@@ -1210,7 +1210,7 @@ Only large parcels can be listed in search.
              type="string"
              length="1"
              follows="left|top"
-             text_color="white"
+             text_color="White"
              height="16"
              layout="topleft"
              left="10"
@@ -1500,7 +1500,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="20"
              name="Snapshot:"
-             text_color="white"
+             text_color="White"
              top="225"
              width="200">
                 Snapshot:
@@ -1546,7 +1546,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="255"
              top="282"
-             text_color="white"
+             text_color="White"
              name="landing_point"
              word_wrap="true"
              width="200">
@@ -1576,7 +1576,7 @@ Only large parcels can be listed in search.
             <text
              type="string"
              length="1"
-             text_color="white"
+             text_color="White"
              follows="left|top"
              height="16"
              layout="topleft"
@@ -1951,7 +1951,7 @@ Only large parcels can be listed in search.
 			 name="access_estate_defined">
 				(Defined by the Estate)
 			</panel.string>
-            <panel.string
+      <panel.string
              name="estate_override">
                 One or more of these options is set at the estate level
             </panel.string>
@@ -2085,7 +2085,7 @@ Only large parcels can be listed in search.
              column_padding="0"
              follows="top|bottom"
              heading_height="14"
-             height="120"
+             height="125"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -2134,7 +2134,7 @@ Only large parcels can be listed in search.
              column_padding="0"
              follows="top|bottom"
              heading_height="14"
-             height="120"
+             height="125"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
new file mode 100644
index 0000000000..b5538a511c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="190"
+ layout="topleft"
+ name="Anim Preview"
+ help_topic="animation_anim_preview"
+ title="ANIMATION.ANIM"
+ width="300">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     name="name_label"
+     top="20"
+     width="275">
+        Name:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     height="19"
+     layout="topleft"
+     left_delta="0"
+     max_length_bytes="63"
+     name="name_form"
+     top_pad="0"
+     width="280" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left_delta="0"
+     mouse_opaque="false"
+     name="description_label"
+     top_pad="10"
+     width="270">
+        Description:
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top|right"
+     height="19"
+     layout="topleft"
+     left_delta="0"
+     max_length_bytes="127"
+     name="description_form"
+     top_pad="0"
+     width="280" />
+    <button
+     follows="left|bottom"
+     height="22"
+     label="Upload (L$[AMOUNT])"
+     layout="topleft"
+     left="45"
+     name="ok_btn"
+     top_pad="60"
+     width="150" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     left_pad="5"
+     width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
new file mode 100644
index 0000000000..cb6b2f6ebc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="610"
+ layout="topleft"
+ name="Animation Preview"
+ help_topic="animation_preview"
+ width="280">
+    <floater.string
+     name="failed_to_initialize">
+        Failed to initialize motion
+    </floater.string>
+    <floater.string
+     name="anim_too_long">
+        Animation file is [LENGTH] seconds in length.
+
+Maximum animation length is [MAX_LENGTH] seconds.
+    </floater.string>
+    <floater.string
+     name="failed_file_read">
+        Unable to read animation file.
+
+[STATUS]
+    </floater.string>
+    <floater.string
+     name="E_ST_OK">
+        Ok
+    </floater.string>
+    <floater.string
+     name="E_ST_EOF">
+        Premature end of file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_CONSTRAINT">
+        Cannot read constraint definition.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FILE">
+        Cannot open BVH file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_HIER">
+        Invalid HIERARCHY header.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_JOINT">
+        Cannot find ROOT or JOINT.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_NAME">
+        Cannot get JOINT name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_OFFSET">
+        Cannot find OFFSET.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_CHANNELS">
+        Cannot find CHANNELS.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_ROTATION">
+        Cannot get rotation order.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_AXIS">
+        Cannot get rotation axis.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_MOTION">
+        Cannot find MOTION.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FRAMES">
+        Cannot get number of frames.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_FRAME_TIME">
+        Cannot get frame time.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_POS">
+        Cannot get position values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_ROT">
+        Cannot get rotation values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_FILE">
+        Cannot open translation file.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_HEADER">
+        Cannot read translation header.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_NAME">
+        Cannot read translation names.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_IGNORE">
+        Cannot read translation ignore value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_RELATIVE">
+        Cannot read translation relative value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_OUTNAME">
+        Cannot read translation outname value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MATRIX">
+        Cannot read translation matrix.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MERGECHILD">
+        Cannot get mergechild name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_MERGEPARENT">
+        Cannot get mergeparent name.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_PRIORITY">
+        Cannot get priority value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_LOOP">
+        Cannot get loop value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EASEIN">
+        Cannot get easeIn values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EASEOUT">
+        Cannot get easeOut values.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_HAND">
+        Cannot get hand morph value.
+    </floater.string>
+    <floater.string
+     name="E_ST_NO_XLT_EMOTE">
+        Cannot read emote name.
+    </floater.string>
+    <floater.string
+     name="E_ST_BAD_ROOT">
+        Incorrect root joint name, use "hip".
+    </floater.string>
+  <text
+     type="string"
+     length="1"
+     bottom="42"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="10"
+     name="name_label">
+        Name:
+    </text>
+    <line_editor
+     bottom_delta="0"
+     follows="top|left|right"
+     height="23"
+     layout="topleft"
+     left="100"
+     name="name_form"
+     right="-10" />
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="10"
+     name="description_label">
+        Description:
+    </text>
+    <line_editor
+     bottom_delta="0"
+     follows="top|left|right"
+     height="23"
+     layout="topleft"
+     left="100"
+     name="description_form"
+     right="-10" />
+    <spinner
+     decimal_digits="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="Priority"
+     label_width="88"
+     layout="topleft"
+     left="10"
+     max_val="4"
+     name="priority"
+     tool_tip="Controls which other animations can be overridden by this animation"
+     width="160" />
+    <check_box
+     top_pad="0"
+     height="14"
+     label="Loop"
+     layout="topleft"
+     left="10"
+     width="100"
+     name="loop_check"
+     tool_tip="Makes this animation loop" />
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="In(%)"
+     label_width="70"
+     layout="topleft"
+     top_pad="5"
+     left="15"
+     max_val="100"
+     name="loop_in_point"
+     tool_tip="Sets point in animation that looping returns to"
+     width="130" />
+    <spinner
+     bottom_delta="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="0"
+     label="Out(%)"
+     layout="topleft"
+     left_pad="10"
+     max_val="100"
+     name="loop_out_point"
+     tool_tip="Sets point in animation that ends a loop"
+     label_width="60"
+     width="120" />
+    <text
+     type="string"
+     length="1"
+     top_pad="0"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="hand_label">
+        Hand Pose
+    </text>
+    <combo_box
+     height="23"
+     layout="topleft"
+     left_pad="20"
+     name="hand_pose_combo"
+     tool_tip="Controls what hands do during animation"
+     width="130">
+        <combo_box.item
+         label="Spread"
+         name="Spread"
+         value="" />
+        <combo_box.item
+         label="Relaxed"
+         name="Relaxed"
+         value="Hands_Relaxed" />
+        <combo_box.item
+         label="Point Both"
+         name="PointBoth"
+         value="Hands_Point" />
+        <combo_box.item
+         label="Fist"
+         name="Fist"
+         value="Hands_Fist" />
+        <combo_box.item
+         label="Relaxed Left"
+         name="RelaxedLeft"
+         value="Hands_Relaxed_L" />
+        <combo_box.item
+         label="Point Left"
+         name="PointLeft"
+         value="Hands_Point_L" />
+        <combo_box.item
+         label="Fist Left"
+         name="FistLeft"
+         value="Hands_Fist_L" />
+        <combo_box.item
+         label="Relaxed Right"
+         name="RelaxedRight"
+         value="Hands_Relaxed_R" />
+        <combo_box.item
+         label="Point Right"
+         name="PointRight"
+         value="Hands_Point_R" />
+        <combo_box.item
+         label="Fist Right"
+         name="FistRight"
+         value="Hands_Fist_R" />
+        <combo_box.item
+         label="Salute Right"
+         name="SaluteRight"
+         value="Hands_Salute_R" />
+        <combo_box.item
+         label="Typing"
+         name="Typing"
+         value="Hands_Typing" />
+        <combo_box.item
+         label="Peace Right"
+         name="PeaceRight"
+         value="Hands_Peace_R" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="emote_label">
+        Expression
+    </text>
+    <combo_box
+     height="23"
+     width="130"
+     layout="topleft"
+     left_pad="20"
+     name="emote_combo"
+     tool_tip="Controls what face does during animation">
+      <item
+       label="(None)"
+       value=""
+       name="[None]" />
+      <item
+       label="Aaaaah"
+       value="Aaaaah"
+       name="Aaaaah" />
+      <item
+       label="Afraid"
+       value="Afraid"
+       name="Afraid" />
+      <item
+       label="Angry"
+       value="Angry"
+       name="Angry" />
+      <item
+       label="Big Smile"
+       value="Big Smile"
+       name="BigSmile" />
+      <item
+       label="Bored"
+       value="Bored"
+       name="Bored" />
+      <item
+       label="Cry"
+       value="Cry"
+       name="Cry" />
+      <item
+       label="Disdain"
+       value="Disdain"
+       name="Disdain" />
+      <item
+       label="Embarrassed"
+       value="Embarrassed"
+       name="Embarrassed" />
+      <item
+       label="Frown"
+       value="Frown"
+       name="Frown" />
+      <item
+       label="Kiss"
+       value="Kiss"
+       name="Kiss" />
+      <item
+       label="Laugh"
+       value="Laugh"
+       name="Laugh" />
+      <item
+       label="Plllppt"
+       value="Plllppt"
+       name="Plllppt" />
+      <item
+       label="Repulsed"
+       value="Repulsed"
+       name="Repulsed" />
+      <item
+       label="Sad"
+       value="Sad"
+       name="Sad" />
+      <item
+       label="Shrug"
+       value="Shrug"
+       name="Shrug" />
+      <item
+       label="Smile"
+       value="Smile" 
+       name="Smile" />
+      <item
+       label="Surprise"
+       value="Surprise" 
+       name="Surprise" />
+      <item
+       label="Wink"
+       value="Wink"
+       name="Wink" />
+      <item
+       label="Worry"
+       value="Worry"
+       name="Worry" />
+    </combo_box>
+    <text
+     type="string"
+     length="1"
+     top_pad="5"
+     follows="top|left"
+     height="23"
+     width="110"
+     word_wrap="true"
+     layout="topleft"
+     left="10"
+     name="preview_label">
+        Preview while
+    </text>
+    <combo_box
+     height="23"
+     width="130"
+     layout="topleft"
+     left_pad="20"
+     name="preview_base_anim"
+     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
+        <item
+         label="Standing"
+         value="Standing"
+         name="Standing" />
+        <item
+         label="Walking"
+         value="Walking"
+         name="Walking" />
+        <item
+         label="Sitting"
+         value="Sitting"
+         name="Sitting" />
+        <item
+         label="Flying"
+         value="Flying"
+         name="Flying" />
+    </combo_box>
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="0.01"
+     initial_value="0"
+     label="Ease In (sec)"
+     label_width="140"
+     layout="topleft"
+     left="10"
+     max_val="10"
+     name="ease_in_time"
+     tool_tip="Amount of time (in seconds) over which animations blends in"
+     top_pad="10"
+     width="210" />
+    <spinner
+     follows="left|top"
+     height="23"
+     increment="0.01"
+     initial_value="0"
+     label="Ease Out (sec)"
+     label_width="140"
+     layout="topleft"
+     top_pad="0"
+     max_val="10"
+     name="ease_out_time"
+     tool_tip="Amount of time (in seconds) over which animations blends out"
+     width="210" />
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="Play_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="play_btn"
+     tool_tip="Play your animation"
+     top_pad="0"
+     width="23" />
+    <button
+	 visible = "false"
+     follows="top|right"
+     height="23"
+     image_overlay="Pause_Over"
+     image_unselected="SegmentedBtn_Left_Off"
+     image_selected="SegmentedBtn_Left_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Left_Disabled"
+	 image_pressed="SegmentedBtn_Left_Press"
+	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
+     layout="topleft"
+     left="10"
+     name="pause_btn"
+     tool_tip="Pause your animation"
+     top_pad="-23"
+     width="23" />	 
+    <button
+     follows="top|right"
+     height="23"
+     image_overlay="StopReload_Over"
+     image_unselected="SegmentedBtn_Right_Off"
+     image_selected="SegmentedBtn_Right_On_Selected"
+	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
+	 image_disabled="SegmentedBtn_Right_Disabled"
+	 image_pressed="SegmentedBtn_Right_Press"
+	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+     layout="topleft"
+     name="stop_btn"
+     tool_tip="Stop animation playback"
+     top_delta="0"
+     left_delta="23"
+     width="23" />
+    <slider
+     left_pad="10"
+     follows="top|right"
+     height="23"
+     width="200"
+     increment="0.0001"
+     initial_value="0"
+     layout="topleft"
+     name="playback_slider"
+     show_text="false" />
+    <text
+     type="string"
+     length="1"
+     height="72"
+     word_wrap="true"
+     top_pad="5"
+     text_color="EmphasisColor"
+     follows="top|left"
+     layout="topleft"
+     left="70"
+     name="bad_animation_text">
+        Unable to read animation file.
+
+We recommend BVH files exported from Poser 4.
+    </text>
+    <button
+    	top="580"
+     follows="bottom|left"
+     height="23"
+     label="Upload (L$[AMOUNT])"
+     layout="topleft"
+     left="10"
+     name="ok_btn"
+     width="128" />
+    <button
+    	top="580"
+     follows="bottom|left"
+     height="23"
+     label="Cancel"
+     layout="topleft"
+     name="cancel_btn"
+     left="142"
+     width="128" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
deleted file mode 100644
index cb6b2f6ebc..0000000000
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="610"
- layout="topleft"
- name="Animation Preview"
- help_topic="animation_preview"
- width="280">
-    <floater.string
-     name="failed_to_initialize">
-        Failed to initialize motion
-    </floater.string>
-    <floater.string
-     name="anim_too_long">
-        Animation file is [LENGTH] seconds in length.
-
-Maximum animation length is [MAX_LENGTH] seconds.
-    </floater.string>
-    <floater.string
-     name="failed_file_read">
-        Unable to read animation file.
-
-[STATUS]
-    </floater.string>
-    <floater.string
-     name="E_ST_OK">
-        Ok
-    </floater.string>
-    <floater.string
-     name="E_ST_EOF">
-        Premature end of file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_CONSTRAINT">
-        Cannot read constraint definition.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FILE">
-        Cannot open BVH file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_HIER">
-        Invalid HIERARCHY header.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_JOINT">
-        Cannot find ROOT or JOINT.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_NAME">
-        Cannot get JOINT name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_OFFSET">
-        Cannot find OFFSET.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_CHANNELS">
-        Cannot find CHANNELS.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_ROTATION">
-        Cannot get rotation order.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_AXIS">
-        Cannot get rotation axis.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_MOTION">
-        Cannot find MOTION.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FRAMES">
-        Cannot get number of frames.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_FRAME_TIME">
-        Cannot get frame time.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_POS">
-        Cannot get position values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_ROT">
-        Cannot get rotation values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_FILE">
-        Cannot open translation file.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_HEADER">
-        Cannot read translation header.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_NAME">
-        Cannot read translation names.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_IGNORE">
-        Cannot read translation ignore value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_RELATIVE">
-        Cannot read translation relative value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_OUTNAME">
-        Cannot read translation outname value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MATRIX">
-        Cannot read translation matrix.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MERGECHILD">
-        Cannot get mergechild name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_MERGEPARENT">
-        Cannot get mergeparent name.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_PRIORITY">
-        Cannot get priority value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_LOOP">
-        Cannot get loop value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EASEIN">
-        Cannot get easeIn values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EASEOUT">
-        Cannot get easeOut values.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_HAND">
-        Cannot get hand morph value.
-    </floater.string>
-    <floater.string
-     name="E_ST_NO_XLT_EMOTE">
-        Cannot read emote name.
-    </floater.string>
-    <floater.string
-     name="E_ST_BAD_ROOT">
-        Incorrect root joint name, use "hip".
-    </floater.string>
-  <text
-     type="string"
-     length="1"
-     bottom="42"
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left="10"
-     name="name_label">
-        Name:
-    </text>
-    <line_editor
-     bottom_delta="0"
-     follows="top|left|right"
-     height="23"
-     layout="topleft"
-     left="100"
-     name="name_form"
-     right="-10" />
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left="10"
-     name="description_label">
-        Description:
-    </text>
-    <line_editor
-     bottom_delta="0"
-     follows="top|left|right"
-     height="23"
-     layout="topleft"
-     left="100"
-     name="description_form"
-     right="-10" />
-    <spinner
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="Priority"
-     label_width="88"
-     layout="topleft"
-     left="10"
-     max_val="4"
-     name="priority"
-     tool_tip="Controls which other animations can be overridden by this animation"
-     width="160" />
-    <check_box
-     top_pad="0"
-     height="14"
-     label="Loop"
-     layout="topleft"
-     left="10"
-     width="100"
-     name="loop_check"
-     tool_tip="Makes this animation loop" />
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="In(%)"
-     label_width="70"
-     layout="topleft"
-     top_pad="5"
-     left="15"
-     max_val="100"
-     name="loop_in_point"
-     tool_tip="Sets point in animation that looping returns to"
-     width="130" />
-    <spinner
-     bottom_delta="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="0"
-     label="Out(%)"
-     layout="topleft"
-     left_pad="10"
-     max_val="100"
-     name="loop_out_point"
-     tool_tip="Sets point in animation that ends a loop"
-     label_width="60"
-     width="120" />
-    <text
-     type="string"
-     length="1"
-     top_pad="0"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="hand_label">
-        Hand Pose
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_pad="20"
-     name="hand_pose_combo"
-     tool_tip="Controls what hands do during animation"
-     width="130">
-        <combo_box.item
-         label="Spread"
-         name="Spread"
-         value="" />
-        <combo_box.item
-         label="Relaxed"
-         name="Relaxed"
-         value="Hands_Relaxed" />
-        <combo_box.item
-         label="Point Both"
-         name="PointBoth"
-         value="Hands_Point" />
-        <combo_box.item
-         label="Fist"
-         name="Fist"
-         value="Hands_Fist" />
-        <combo_box.item
-         label="Relaxed Left"
-         name="RelaxedLeft"
-         value="Hands_Relaxed_L" />
-        <combo_box.item
-         label="Point Left"
-         name="PointLeft"
-         value="Hands_Point_L" />
-        <combo_box.item
-         label="Fist Left"
-         name="FistLeft"
-         value="Hands_Fist_L" />
-        <combo_box.item
-         label="Relaxed Right"
-         name="RelaxedRight"
-         value="Hands_Relaxed_R" />
-        <combo_box.item
-         label="Point Right"
-         name="PointRight"
-         value="Hands_Point_R" />
-        <combo_box.item
-         label="Fist Right"
-         name="FistRight"
-         value="Hands_Fist_R" />
-        <combo_box.item
-         label="Salute Right"
-         name="SaluteRight"
-         value="Hands_Salute_R" />
-        <combo_box.item
-         label="Typing"
-         name="Typing"
-         value="Hands_Typing" />
-        <combo_box.item
-         label="Peace Right"
-         name="PeaceRight"
-         value="Hands_Peace_R" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="emote_label">
-        Expression
-    </text>
-    <combo_box
-     height="23"
-     width="130"
-     layout="topleft"
-     left_pad="20"
-     name="emote_combo"
-     tool_tip="Controls what face does during animation">
-      <item
-       label="(None)"
-       value=""
-       name="[None]" />
-      <item
-       label="Aaaaah"
-       value="Aaaaah"
-       name="Aaaaah" />
-      <item
-       label="Afraid"
-       value="Afraid"
-       name="Afraid" />
-      <item
-       label="Angry"
-       value="Angry"
-       name="Angry" />
-      <item
-       label="Big Smile"
-       value="Big Smile"
-       name="BigSmile" />
-      <item
-       label="Bored"
-       value="Bored"
-       name="Bored" />
-      <item
-       label="Cry"
-       value="Cry"
-       name="Cry" />
-      <item
-       label="Disdain"
-       value="Disdain"
-       name="Disdain" />
-      <item
-       label="Embarrassed"
-       value="Embarrassed"
-       name="Embarrassed" />
-      <item
-       label="Frown"
-       value="Frown"
-       name="Frown" />
-      <item
-       label="Kiss"
-       value="Kiss"
-       name="Kiss" />
-      <item
-       label="Laugh"
-       value="Laugh"
-       name="Laugh" />
-      <item
-       label="Plllppt"
-       value="Plllppt"
-       name="Plllppt" />
-      <item
-       label="Repulsed"
-       value="Repulsed"
-       name="Repulsed" />
-      <item
-       label="Sad"
-       value="Sad"
-       name="Sad" />
-      <item
-       label="Shrug"
-       value="Shrug"
-       name="Shrug" />
-      <item
-       label="Smile"
-       value="Smile" 
-       name="Smile" />
-      <item
-       label="Surprise"
-       value="Surprise" 
-       name="Surprise" />
-      <item
-       label="Wink"
-       value="Wink"
-       name="Wink" />
-      <item
-       label="Worry"
-       value="Worry"
-       name="Worry" />
-    </combo_box>
-    <text
-     type="string"
-     length="1"
-     top_pad="5"
-     follows="top|left"
-     height="23"
-     width="110"
-     word_wrap="true"
-     layout="topleft"
-     left="10"
-     name="preview_label">
-        Preview while
-    </text>
-    <combo_box
-     height="23"
-     width="130"
-     layout="topleft"
-     left_pad="20"
-     name="preview_base_anim"
-     tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-        <item
-         label="Standing"
-         value="Standing"
-         name="Standing" />
-        <item
-         label="Walking"
-         value="Walking"
-         name="Walking" />
-        <item
-         label="Sitting"
-         value="Sitting"
-         name="Sitting" />
-        <item
-         label="Flying"
-         value="Flying"
-         name="Flying" />
-    </combo_box>
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="0.01"
-     initial_value="0"
-     label="Ease In (sec)"
-     label_width="140"
-     layout="topleft"
-     left="10"
-     max_val="10"
-     name="ease_in_time"
-     tool_tip="Amount of time (in seconds) over which animations blends in"
-     top_pad="10"
-     width="210" />
-    <spinner
-     follows="left|top"
-     height="23"
-     increment="0.01"
-     initial_value="0"
-     label="Ease Out (sec)"
-     label_width="140"
-     layout="topleft"
-     top_pad="0"
-     max_val="10"
-     name="ease_out_time"
-     tool_tip="Amount of time (in seconds) over which animations blends out"
-     width="210" />
-    <button
-     follows="top|right"
-     height="23"
-     image_overlay="Play_Over"
-     image_unselected="SegmentedBtn_Left_Off"
-     image_selected="SegmentedBtn_Left_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Left_Disabled"
-	 image_pressed="SegmentedBtn_Left_Press"
-	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="play_btn"
-     tool_tip="Play your animation"
-     top_pad="0"
-     width="23" />
-    <button
-	 visible = "false"
-     follows="top|right"
-     height="23"
-     image_overlay="Pause_Over"
-     image_unselected="SegmentedBtn_Left_Off"
-     image_selected="SegmentedBtn_Left_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Left_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Left_Disabled"
-	 image_pressed="SegmentedBtn_Left_Press"
-	 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-     layout="topleft"
-     left="10"
-     name="pause_btn"
-     tool_tip="Pause your animation"
-     top_pad="-23"
-     width="23" />	 
-    <button
-     follows="top|right"
-     height="23"
-     image_overlay="StopReload_Over"
-     image_unselected="SegmentedBtn_Right_Off"
-     image_selected="SegmentedBtn_Right_On_Selected"
-	 image_disabled_selected="SegmentedBtn_Right_Selected_Disabled"
-	 image_disabled="SegmentedBtn_Right_Disabled"
-	 image_pressed="SegmentedBtn_Right_Press"
-	 image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-     layout="topleft"
-     name="stop_btn"
-     tool_tip="Stop animation playback"
-     top_delta="0"
-     left_delta="23"
-     width="23" />
-    <slider
-     left_pad="10"
-     follows="top|right"
-     height="23"
-     width="200"
-     increment="0.0001"
-     initial_value="0"
-     layout="topleft"
-     name="playback_slider"
-     show_text="false" />
-    <text
-     type="string"
-     length="1"
-     height="72"
-     word_wrap="true"
-     top_pad="5"
-     text_color="EmphasisColor"
-     follows="top|left"
-     layout="topleft"
-     left="70"
-     name="bad_animation_text">
-        Unable to read animation file.
-
-We recommend BVH files exported from Poser 4.
-    </text>
-    <button
-    	top="580"
-     follows="bottom|left"
-     height="23"
-     label="Upload (L$[AMOUNT])"
-     layout="topleft"
-     left="10"
-     name="ok_btn"
-     width="128" />
-    <button
-    	top="580"
-     follows="bottom|left"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     left="142"
-     width="128" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index 35918e9705..38428b36fc 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -1,70 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="198"
+ height="170"
  layout="topleft"
  name="build options floater"
  help_topic="build_options_floater"
  save_rect="true"
  title="GRID OPTIONS"
  width="264">
- 	<floater.string
-     name="grid_screen_text">
-        Screen
-    </floater.string>
-    <floater.string
-     name="grid_local_text">
-        Local
-    </floater.string>
-    <floater.string
-     name="grid_world_text">
-        World
-    </floater.string>
-    <floater.string
-     name="grid_reference_text">
-        Reference
-    </floater.string>
-    <floater.string
-     name="grid_attachment_text">
-        Attachment
-    </floater.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     tool_tip="Grid opacity"
-     name="grid_mode_label"
-     top_pad="30"
-     width="123">
-        Mode
-    </text>
-    <combo_box
-     height="23"
-     layout="topleft"
-     left_pad="9"
-     follows="left|top"
-     name="combobox grid mode"
-     tool_tip="Choose the type of grid ruler for positioning the object"
-     top_delta="-3"
-     width="108">
-      <combo_box.item
-       label="World grid"
-       name="World"
-       value="World" />
-      <combo_box.item
-       label="Local grid"
-       name="Local"
-       value="Local" />
-      <combo_box.item
-       label="Reference grid"
-       name="Reference"
-       value="Reference" />
-       <combo_box.commit_callback
-      function="GridOptions.gridMode"/>
-    </combo_box>
     <spinner
      control_name="GridResolution"
      follows="left|top"
@@ -77,7 +20,7 @@
      max_val="5"
      min_val="0.01"
      name="GridResolution"
-     top_pad="4"
+     top_pad="30"
      width="200" />
     <spinner
      control_name="GridDrawSize"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 92001534e7..ac96a70805 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -62,7 +62,7 @@
      layout="topleft"
      left="10"
      name="buy_text"
-     text_color="white"
+     text_color="White"
      top="220"
      use_ellipses="true" 
      width="260">
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 6afa24d04a..553c5d51d0 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -215,7 +215,7 @@
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -229,7 +229,7 @@
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -243,7 +243,7 @@ Re-enter amount to see the latest exchange rate.
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
@@ -257,7 +257,7 @@ Re-enter amount to see the latest exchange rate.
     <text
      type="string"
      length="1"
-     text_color="0.7 0.7 0.7 0.5"
+     text_color="LtGray_50"
      follows="top|left"
      layout="topleft"
      halign="right"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 8dfb6ba00c..5fdd4aa49d 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -89,7 +89,7 @@
      left_delta="0"
 	 line_spacing.pixels="7"
      name="buy_text"
-     text_color="white"
+     text_color="White"
      top_pad="5"
      use_ellipses="true"
      width="260"
@@ -106,7 +106,7 @@ Buy for L$[AMOUNT] from:
      left_delta="0"
 	 line_spacing.pixels="7"
      name="buy_name_text"
-     text_color="white"
+     text_color="White"
      top_pad="5"
      use_ellipses="true"
      width="260">
diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml
index dc1ee5f24e..2cf6e682fd 100644
--- a/indra/newview/skins/default/xui/en/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml
@@ -20,7 +20,7 @@
         Choose a group:
     </text>
     <scroll_list
-     height="160"
+     height="165"
      layout="topleft"
      left_delta="0"
      name="group list"
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 49aa8f3840..77adb5524e 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -22,7 +22,6 @@
           top="5"
           width="180"
           height="40"
-          pad_bottom="-5"
           label="Pause"
           font="SansSerifHuge"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
index 6f387f4800..3d33d19de5 100644
--- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
@@ -99,7 +99,7 @@
             halign="center"
             font="SansSerifMedium"
             font_shadow="hard"
-            valign="bottom">
+            valign="top">
           Drag items here to create folders
         </text>
       </panel>
@@ -114,8 +114,8 @@
           height="20"
           wrap="true"
           halign="left"
-          valign="bottom"
-          font="SansSerif" />
+          valign="center"
+          font="SansSerif"/>
       <button
           label="Send to Marketplace"
           tool_tip="Push to my Marketplace Storefront"
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index eebc5ddc72..0e211551e6 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -117,18 +117,18 @@
              name="lod_tab_border"
              top_pad="0"
              width="619" />
-            <text
-             follows="left|top"
-             height="18"
-             initial_value="Source"
-             layout="topleft"
-             left="75"
-             name="source"
-             text_color="ModelUploaderLabels"
-             top="15"
-             valign="center"
-             value="Source"
-             width="335" />
+          <text
+           follows="left|top"
+           height="18"
+           initial_value="Source"
+           layout="topleft"
+           left="75"
+           name="source"
+           text_color="ModelUploaderLabels"
+           top="15"
+           valign="center"
+           value="Source"
+           width="335"/>
             <text
              follows="left|top"
              halign="right"
@@ -163,7 +163,7 @@
              name="high_label"
              text_color="ModelUploaderLabels"
              top_pad="10"
-             valign="center"
+             valign="top"
              value="High"
              width="65" />
             <combo_box
@@ -240,34 +240,34 @@
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="high_triangles"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="high_vertices"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="center"
-             height="18"
+             height="15"
              initial_value=""
              layout="topleft"
              left_pad="0"
              name="high_status"
-             valign="center"
+             valign="top"
              value=""
              width="65" />
             <icon
@@ -277,7 +277,7 @@
              left_delta="20"
              mouse_opaque="true"
              name="status_icon_high"
-             top_delta="0"
+             top_delta="-2"
              width="16" />
             <text
              follows="left|top"
@@ -288,7 +288,7 @@
              name="medium_label"
              text_color="ModelUploaderLabels"
              top_pad="15"
-             valign="center"
+             valign="top"
              value="Medium"
              width="65" />
             <combo_box
@@ -368,34 +368,34 @@
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="medium_triangles"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="medium_vertices"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="center"
-             height="18"
+             height="15"
              initial_value=""
              layout="topleft"
              left_pad="0"
              name="medium_status"
-             valign="center"
+             valign="top"
              value=""
              width="65" />
             <icon
@@ -405,7 +405,7 @@
              left_delta="20"
              mouse_opaque="true"
              name="status_icon_medium"
-             top_delta="0"
+             top_delta="-2"
              width="16" />
             <text
              follows="left|top"
@@ -416,7 +416,7 @@
              name="low_label"
              text_color="ModelUploaderLabels"
              top_pad="15"
-             valign="center"
+             valign="top"
              value="Low"
              width="65" />
             <combo_box
@@ -496,34 +496,34 @@
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="low_triangles"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="low_vertices"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="center"
-             height="18"
+             height="15"
              initial_value=""
              layout="topleft"
              left_pad="0"
              name="low_status"
-             valign="center"
+             valign="top"
              value=""
              width="65" />
             <icon
@@ -533,7 +533,7 @@
              left_delta="20"
              mouse_opaque="true"
              name="status_icon_low"
-             top_delta="0"
+             top_delta="-2"
              width="16" />
             <text
              follows="left|top"
@@ -544,7 +544,7 @@
              name="lowest_label"
              text_color="ModelUploaderLabels"
              top_pad="15"
-             valign="center"
+             valign="top"
              value="Lowest"
              width="65" />
             <combo_box
@@ -624,34 +624,34 @@
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="lowest_triangles"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="right"
-             height="18"
+             height="15"
              initial_value="0"
              layout="topleft"
              left_pad="0"
              name="lowest_vertices"
-             valign="center"
+             valign="top"
              value="0"
              width="65" />
             <text
              follows="left|top"
              halign="center"
-             height="18"
+             height="15"
              initial_value=""
              layout="topleft"
              left_pad="0"
              name="lowest_status"
-             valign="center"
+             valign="top"
              value=""
              width="65" />
             <icon
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 402868bb97..b2662331b0 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -100,7 +100,7 @@
          help_topic="preferences_colors_tab"
          name="colors" />
         <panel
-		 class="panel_preference"
+         class="panel_preference_privacy"
          filename="panel_preferences_privacy.xml"
          label="Privacy"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 8427c7b06f..3ea5f54f2c 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -41,18 +41,26 @@
      label_selected="Stop"
      layout="topleft"
      left="10"
-     name="Anim play btn"
+     name="Inworld"
      tool_tip="Play this animation so that others can see it"
      top="47"
-     width="125" />
+     width="125">
+       <button.commit_callback
+        function="PreviewAnim.Play"
+        parameter="Inworld" /> 
+    </button>
     <button
      height="20"
      label="Play Locally"
      label_selected="Stop"
      layout="topleft"
      left_pad="5"
-     name="Anim audition btn"
+     name="Locally"
      tool_tip="Play this animation so that only you can see it"
      top_delta="0"
-     width="125" />
+     width="125">
+       <button.commit_callback
+        function="PreviewAnim.Play"
+        parameter="Locally" /> 
+    </button>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index f95f21e63a..a04050e7eb 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -26,6 +26,26 @@
                   background_visible="true">
       <text follows="top|left|right" halign="center" text_color="white">flex</text>
     </layout_panel>
+    <layout_panel name="flex"
+                  auto_resize="true"
+                  user_resize="true"
+                  bg_alpha_color="blue"
+                  height="11"
+                  min_height="0"
+                  visible="false"
+                  background_visible="true">
+      <text follows="top|left|right" halign="center" text_color="white">flex</text>
+    </layout_panel>
+    <layout_panel name="flex"
+                  auto_resize="true"
+                  user_resize="true"
+                  bg_alpha_color="blue"
+                  height="11"
+                  min_height="0"
+                  visible="true"
+                  background_visible="true">
+      <text follows="top|left|right" halign="center" text_color="white">flex</text>
+    </layout_panel>
     <layout_panel name="flex"
                   auto_resize="true"
                   user_resize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
new file mode 100644
index 0000000000..d11373ce1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ can_tear_off="false"
+ can_resize="true"
+ can_drag_on_left="false"
+ can_close="true"
+ can_dock="true"
+ bevel_style="in"
+ height="300"
+ layout="topleft"
+ name="Test Floater"
+ save_rect="true"
+ title="TEST FLOATER"
+ save_dock_state="true"
+ save_visibility="true"
+ single_instance="true" 
+ width="650">
+  <text left="0"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"        
+        bottom="-5"
+        width="100"
+        valign="top">
+this
+is
+some
+text
+that
+is
+top
+aligned</text>
+  <text left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        bottom="-5"
+        clip_partial="true"
+        width="100"
+        valign="center">
+this
+is
+some
+text
+that
+is
+center
+aligned</text>
+  <text left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"        
+        bottom="-5"
+        width="100"
+        valign="bottom">
+this
+is
+some
+text
+that
+is
+bottom
+aligned</text>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"
+        bottom="-5"
+        width="100"
+        valign="top">
+this
+is
+some
+text
+that
+is
+top
+aligned
+  </text_editor>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        bottom="-5"
+        clip_partial="true"
+        width="100"
+        valign="center">
+this
+is
+some
+text
+that
+is
+center
+aligned
+  </text_editor>
+  <text_editor left_pad="5"
+        follows="left|top|bottom"
+        top="5"
+        clip_partial="true"
+        bottom="-5"
+        width="100"
+        valign="bottom">
+this
+is
+some
+text
+that
+is
+bottom
+aligned
+  </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 2df9bb35fe..1d31fbd6dc 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -8,21 +8,7 @@
  help_topic="floater_test_textbox"
  translate="false"
  width="800">
-    <text
-     type="string"
-     length="1"
-     height="90"
-     layout="topleft"
-     left="10"
-     top_pad="30"
-     width="300">
-        First line of multiple lines
-Second line of multiple lines
-Third line of multiple lines
-Fourth line of multiple lines
-Fifth line of multiple lines
-    </text>
-  <text
+ <text
     clip_partial="true"
     top_pad="10"
     left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f9147ea650..2d63c94fe1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -14,7 +14,27 @@
  save_visibility="true"
  sound_flags="0"
  width="295">
-    <floater.string
+  <floater.string
+     name="grid_screen_text">
+    Screen
+  </floater.string>
+  <floater.string
+   name="grid_local_text">
+    Local
+  </floater.string>
+  <floater.string
+   name="grid_world_text">
+    World
+  </floater.string>
+  <floater.string
+   name="grid_reference_text">
+    Reference
+  </floater.string>
+  <floater.string
+   name="grid_attachment_text">
+    Attachment
+  </floater.string>
+  <floater.string
      name="status_rotate">
         Drag colored bands to rotate object
     </floater.string>
@@ -312,20 +332,48 @@
      top_pad="0"
      name="checkbox snap to grid"
      width="134" />
-    <button
-     left_pad="0"
-     label="Options..."
+    <combo_box
+      height="20"
+      layout="topleft"
+      follows="left|top"
+      name="combobox grid mode"
+      tool_tip="Choose the type of grid ruler for positioning the object"
+      top="83"
+      left="195"
+      top_pad="0"
+      width="60">
+      <combo_box.item
+      label="World"
+      name="World"
+      value="World" />
+      <combo_box.item
+      label="Local"
+      name="Local"
+      value="Local" />
+      <combo_box.item
+      label="Reference"
+      name="Reference"
+      value="Reference" />
+      <combo_box.commit_callback
+      function="BuildTool.gridMode"/>
+    </combo_box>  
+  
+  <button
+     left="259"
+     label=""
+     image_selected="ForwardArrow_Press"
+     image_unselected="ForwardArrow_Off"
      layout="topleft"
      follows="top|left"
      name="Options..."
      tool_tip="See more grid options"
      top="83"
-     right="-35"
-     width="65"
-     height="21" >
+     width="25"
+     height="20" >
 	 <button.commit_callback
 	     function="BuildTool.gridOptions"/>
 	</button>
+  
    <button
      follows="left|top"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 72e6187a14..fcaae9d172 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -18,7 +18,7 @@
   <text
     follows="left|top"
     font="SansSerifMedium"
-    valign="bottom"
+    valign="top"
     halign="left"
     height="20"
     layout="topleft"
@@ -33,7 +33,7 @@
   <text
     follows="left|top"
     font="SansSerifMedium"
-    valign="bottom"
+    valign="top"
     halign="left"
     height="20"
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index cea19ec75c..d99b29f324 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -71,7 +71,7 @@
              layout="topleft"
              left_pad="10"
              name="user_text"
-             text_color="white"
+             text_color="White"
              top="4"
              use_ellipses="true"
              value="My Avatar:"
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 8d14c974b4..bfeb8fc470 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -56,7 +56,7 @@ owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
    halign="right"
    right="-5"
    name="price_text"
-   text_color="white"
+   text_color="White"
    top="60"
    font_shadow="none"
    width="60">
@@ -90,6 +90,7 @@ L$30,000
    follows="all"
    font="SansSerifSmall"
    height="13"
+   clip="false"
    name="object_media_url"
    width="207"
    left_pad="2"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..59dd17ea9d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1667,7 +1667,7 @@ Unable to create output file: [FILE]
    icon="alertmodal.tga"
    name="DoNotSupportBulkAnimationUpload"
    type="alertmodal">
-[APP_NAME] does not currently support bulk upload of animation files.
+[APP_NAME] does not currently support bulk upload of BVH format animation files.
   <tag>fail</tag>
   </notification>
 
@@ -6409,11 +6409,11 @@ Grant this request?
     <form name="form">
       <button
        index="-2"
-       name="Mute"
+       name="Client_Side_Mute"
        text="Block"/>
       <button
        index="-1"
-       name="Ignore"
+       name="Client_Side_Ignore"
        text="Ignore"/>
     </form>
   </notification>
@@ -6428,11 +6428,11 @@ Grant this request?
     <form name="form">
       <button
        index="-2"
-       name="Mute"
+       name="Client_Side_Mute"
        text="Block"/>
       <button
        index="-1"
-       name="Ignore"
+       name="Client_Side_Ignore"
        text="Ignore"/>
     </form>
   </notification>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 1e6a31d388..7c67fd7f83 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -28,7 +28,7 @@
      layout="topleft"
      left_pad="10"
      name="title_text"
-     text_color="white"
+     text_color="White"
      top="5"
      width="250">
         Block List
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 2645d472f9..5c5c718bdf 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -23,7 +23,7 @@
     <text
       parse_urls="false"
       allow_scroll="false"
-      v_pad = "7"
+      v_pad = "6"
       read_only = "true"
       follows="left|right"
       font.style="BOLD"
@@ -37,7 +37,7 @@
       top="0"
       translate="false"
       use_ellipses="true"
-      valign="bottom" 
+      valign="top" 
       value="TestString PleaseIgnore" />
   <text
     allow_scroll="false"
@@ -49,7 +49,7 @@
     left_pad="5"
     name="time_box"
     right="-5"
-    top="8"
+    top="7"
     value="23:30"
     width="110" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 6af1105400..1b97de2b05 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -16,13 +16,13 @@
         top="3"
         width="18" />
 	<text_chat
-      top="5"
+      top="3"
       left="30"
       height="120"
       text_color="white"
       word_wrap="true"
       mouse_opaque="true"
-      valign="bottom"
+      valign="top"
       name="msg_text">
 	</text_chat>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index df459b4083..4b05ab27e4 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -29,7 +29,7 @@
      width="380" />
     <icon
      height="16"
-     color="0.75 0.75 0.75 1"
+     color="LtGray"
      follows="top|left"
      image_name="Inv_Object"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 69a692e2c4..f34b913218 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -164,7 +164,7 @@
      layout="topleft"
      left_pad="8"
      name="edit_wearable_title"
-     text_color="white"
+     text_color="White"
      top="3"
      value="Editing Shape"
      use_ellipses="true"
@@ -190,7 +190,7 @@
          layout="topleft"
          left="10"
          name="description_text"
-         text_color="white"
+         text_color="White"
          top="10"
          value="Shape:"
          width="150" />
@@ -254,7 +254,7 @@
          name="description"
          prevalidate_callback="ascii"
          select_on_focus="true"
-         text_color="black"
+         text_color="Black"
          top_pad="3"
          width="290" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index a7178dc288..eea2606125 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -172,7 +172,7 @@ including the Everyone and Owner Roles.
              draw_heading="true"
              draw_stripes="false"
              heading_height="23"
-             height="130"
+             height="132"
              layout="topleft"
              search_column="1"
              left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 383e637ace..413e22e444 100644
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inbox_inventory_panel
+    accepts_drag_and_drop="false"
     name="inventory_inbox"
     start_folder="Received Items"
     follows="all" layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 4251128714..2e5d650902 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -15,7 +15,7 @@
     <panel
      background_visible="true"
      bevel_style="in"
-     bg_alpha_color="black"
+     bg_alpha_color="Black"
      follows="top"
      height="24"
      label="im_header"
@@ -64,7 +64,7 @@
          left_pad="5"
          name="user_name"
          parse_urls="false"
-         text_color="white"
+         text_color="White"
          top="8"
          translate="false"
          use_ellipses="true"
@@ -90,7 +90,7 @@
      layout="topleft"
      left="10"
      name="message"
-     text_color="white"
+     text_color="White"
      top="33"
      use_ellipses="true"
      value=""
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index d2088594dd..fd6e96b9a7 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -271,7 +271,7 @@
                 <text_editor
                  bg_readonly_color="DkGray2"
                  follows="all"
-                 height="70"
+                 height="75"
                  layout="topleft"
                  left="0"
                  max_length="127"
@@ -288,7 +288,7 @@
                  layout="topleft"
                  left="0"
                  name="folder_label"
-                 top_pad="15"
+                 top_pad="10"
                  value="Landmark location:"
                  width="290" />
                 <combo_box
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d6d8b2a83e..1c882bb099 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -80,7 +80,6 @@
      top="16"
      width="288" />
     <recent_inventory_panel
-     accepts_drag_and_drop="false"
      bg_opaque_color="DkGray2"
      bg_alpha_color="DkGray2"
      background_visible="true"
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 4bf420b79f..3edeb9aa36 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -70,7 +70,7 @@
            layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="480"
+           min_width="410"
            name="navigation_layout_panel"
            width="480">
 	        <panel
@@ -148,15 +148,15 @@
 	         layout="topleft"
            auto_resize="true"
            user_resize="true"
-           min_width="315"
+           min_width="185"
            name="favorites_layout_panel"
-           width="315">
+           width="320">
            <icon
              follows="top|left"
              height="25"
              image_name="ChatBarHandle"
              layout="topleft"
-             left="-318"
+             left="-323"
              name="resize_handle"
              top="4"
              width="5" />
@@ -171,16 +171,17 @@
              name="favorite"
              image_drag_indication="Accordion_ArrowOpened_Off"
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-             width="311">
+             width="320">
             <label
              follows="left|top"
-             height="15"
+             height="13"
              layout="topleft"
              left="10"
              name="favorites_bar_label"
              text_color="LtGray"
              tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-             top="12"
+             top="13"
+	     valign="bottom"
              width="102">
               Favorites Bar
             </label>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index d492f9bd68..d683116eb8 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -1,35 +1,63 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
- height="300"
  follows="all"
+ height="300"
+ help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- help_topic="nearby_chat"
  width="320">
-            <check_box
-             bottom_delta="36"
-             control_name="TranslateChat"
-             enabled="true"
-             height="16"
-             label="Translate chat"
-             layout="topleft"
-             left="5"
-             name="translate_chat_checkbox"
-             width="230" />
-  <chat_history
-    parse_urls="true"
-    bg_readonly_color="ChatHistoryBgColor"
-    bg_writeable_color="ChatHistoryBgColor"
-    follows="all"
-    left="5"
-    top_delta="17"
-    layout="topleft"
-    height="260"
-    name="chat_history"
-    parse_highlights="true"
-    text_color="ChatHistoryTextColor"
-    text_readonly_color="ChatHistoryTextColor"
-    right_widget_pad="5"
-    left_widget_pad="0"
-    width="315" />
+  <layout_stack
+   follows="all"
+   height="295"
+   layout="topleft"
+   left="0"
+   name="stack"
+   top="5"
+   orientation="vertical"
+   width="320">
+    <layout_panel
+     auto_resize="false"
+     height="26"
+     layout="topleft"
+     left_delta="0"
+     name="translate_chat_checkbox_lp"
+     top_delta="0"
+     visible="true"
+     width="313">
+      <check_box
+       top="10"
+       control_name="TranslateChat"
+       enabled="true"
+       height="16"
+       label="Translate chat"
+       layout="topleft"
+       left="5"
+       name="translate_chat_checkbox"
+       width="300" />
+    </layout_panel>
+    <layout_panel
+     auto_resize="true"
+     height="277"
+     left_delta="0"
+     layout="topleft"
+     name="chat_history_lp"
+     width="318">
+      <chat_history
+       bg_readonly_color="ChatHistoryBgColor"
+       bg_writeable_color="ChatHistoryBgColor"
+       follows="all"
+       layout="topleft"
+       left="5"
+       left_widget_pad="0"
+       height="272"
+       name="chat_history"
+       parse_highlights="true"
+       parse_urls="true"
+       right_widget_pad="5"
+       text_color="ChatHistoryTextColor"
+       text_readonly_color="ChatHistoryTextColor"
+       top="0"
+       width="313" />
+    </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index f6f62ac54e..94c468e1bb 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -3,8 +3,8 @@
   background_opaque="false"
       border_visible="false"
   background_visible="true"
-  bg_alpha_color="1 0.3 0.3 0"
-  bg_opaque_color="1 0.3 0.3 0"
+  bg_alpha_color="PanelNotificationBackground"
+  bg_opaque_color="PanelNotificationBackground"
   label="notification_panel"
   layout="topleft"
   left="0"
@@ -20,8 +20,8 @@
       border_visible="false"
  bevel_style="none"
     background_visible="true"
-  bg_alpha_color="0.3 0.3 0.3 0"
-  bg_opaque_color="0.3 0.3 0.3 0"
+  bg_alpha_color="ToastBackground"
+  bg_opaque_color="ToastBackground"
     follows="left|right|top"
     height="100"
     label="info_panel"
@@ -39,7 +39,7 @@
       left="10"
       name="text_box"
       read_only="true"
-      text_color="white"
+      text_color="White"
       top="10"
       visible="false" 
       width="285"
@@ -52,7 +52,7 @@
       layout="topleft"
       left="10"
       name="caution_text_box"
-      text_color="1 0.82 0.46 1"
+      text_color="NotifyCautionBoxColor"
       top="10"
       visible="false"
       width="285"
@@ -60,7 +60,7 @@
     <text_editor
     	h_pad="0"
 	v_pad="0"
-      bg_readonly_color="0.0 0.0 0.0 0"
+      bg_readonly_color="Transparent"
       border_visible="false"
       embedded_items="false"
       enabled="false"
@@ -73,8 +73,8 @@
       name="text_editor_box"
       read_only="true"
       tab_stop="false"
-      text_color="white"
-      text_readonly_color="white"
+      text_color="White"
+      text_readonly_color="White"
       top="10"
       visible="false"
       width="285"
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index b1a7697e83..dadbd9c9ab 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
@@ -25,7 +25,7 @@
      layout="topleft"
      left_pad="5"
      name="message"
-     text_color="white"
+     text_color="White"
      top="15"
      use_ellipses="true"
      value=""
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 9827180aa7..24882988b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -331,7 +331,7 @@
    </text>
    <radio_group
      control_name="LetterKeysFocusChatBar" 
-     height="20"
+     height="34"
      layout="topleft"
      left="35"
      top_pad="0" 
@@ -339,7 +339,7 @@
         <radio_item
          label="Starts local chat"
          name="radio_start_chat"
-         top_delta="20" 
+         top="0" 
          layout="topleft"
          height="16" 
          left="0" 
@@ -364,7 +364,7 @@
      layout="topleft"
      left="30"
      name="title_afk_text"
-     top_pad="15" 
+     top_pad="5" 
      width="190">
     	Away timeout:
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 1f92244eb9..b71586aab1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -63,7 +63,7 @@
       layout="topleft"
       left_pad="0"
       name="mute_chb_label"
-      top_delta="0"
+      top_delta="-1"
       width="150"
       wrap="true">
       Mute when minimized
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index d453a970e7..22c1139cdb 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -67,7 +67,6 @@
      label_shadow="true"
      name="buyL"
      pad_right="0"
-     pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="0"
      width="80" />
@@ -87,7 +86,6 @@
      left_pad="0"
      label_shadow="true"
      name="goShop"
-     pad_bottom="2"
      tool_tip="Open Second Life Marketplace"
      top="0"
      width="65" />
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 5e74689c5a..007b73a4bc 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -13,7 +13,7 @@
   follows="left|right"
   background_opaque="false"
   background_visible="true"
-  bg_alpha_color="0.0 0.0 0.0 0.0" >
+  bg_alpha_color="SysWellItemUnselected" >
   <text
     clip_partial="true" 
     top="2"
@@ -22,7 +22,7 @@
     height="28"
     layout="topleft"
     follows="right|left"
-    text_color="white"
+    text_color="White"
     use_ellipses="true"
     word_wrap="true"
     mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index c89e1dc215..c5b0be0616 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -44,7 +44,7 @@
      parse_urls="false"
      use_ellipses="true"
      name="region"
-     text_color="white"
+     text_color="White"
      top="4"
      value="..."
      width="330" />
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 062c403a26..0b5aff54ca 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -59,7 +59,7 @@
    left="20"
    name="toast_text"
    word_wrap="true"
-   text_color="white"
+   text_color="White"
    top="5"
    translate="false"
    use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 29aa6d1039..ee790e8dd4 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -48,7 +48,7 @@
                       height="300"
                       width="330" />
              </layout_panel>
-			 <layout_panel
+			    <layout_panel
                  width="330"
                  layout="topleft"
                  auto_resize="true"
@@ -73,6 +73,7 @@
                      <string name="InboxLabelWithArg">Received items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received items</string>
                      <button
+                        control_name="InventoryInboxToggleState"
                         label="Received items"
 						font="SansSerifMedium"
                         name="inbox_btn"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4bc72be49b..9752652679 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -369,6 +369,9 @@ Please try logging in again in a minute.</string>
 	<string name="anim_yes_happy">Yes (Happy)</string>
 	<string name="anim_yes_head">Yes</string>
 
+	<!-- build floater -->
+	<string name="multiple_textures">Multiple</string>
+
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
@@ -3238,6 +3241,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_to_label">To</string>
 	<string name="IM_moderator_label">(Moderator)</string>
 	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
+	<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
 
 	<!-- voice calls -->
 	<string name="answered_call">Your call has been answered</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
index 1bb3188cc8..8a4ccb19f9 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
@@ -17,13 +17,13 @@
   <voice_call_invited_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="0.5 0.5 0.5 0.5"/>
+   color="AvatarListItemIconVoiceInvitedColor"/>
 
   <!-- styles for avatar item JOINED to voice call -->
   <voice_call_joined_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="white"/>
+   color="White"/>
 
   <!-- styles for avatar item which HAS LEFT voice call -->
   <voice_call_left_style
@@ -35,11 +35,11 @@
   <online_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="white"/>
+   color="White"/>
 
   <!-- styles for OFFLINE avatar item -->
   <offline_style
    font="SansSerifSmall"
    font.style="NORMAL"
-   color="0.5 0.5 0.5 1.0"/>
+   color="Gray"/>
 </avatar_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
index 0eec002006..0016a8cf53 100644
--- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
@@ -24,7 +24,7 @@
    parse_urls="false"
    use_ellipses="true"
    name="item_name"
-   text_color="white"
+   text_color="White"
    top="5"
    value="..."
    width="359" />
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index e2baba92a3..2b2c3faf91 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -21,7 +21,7 @@
         font="SansSerifSmall"
         hover_glow_amount="0.15"
         halign="center"
-        pad_bottom="3" 
+        pad_bottom="1"
         height="23"
         scale_image="true"
         handle_right_mouse="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index cca64fad2a..8947024e45 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -10,7 +10,7 @@
                         text_readonly_color="LabelDisabledColor"/>
   <check_box.check_button name="CheckboxCtrl Button"
                           left="2"
-                          bottom="2"
+                          bottom="1"
                           width="13"
                           height="13" 
                           commit_on_return="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
index 96d72c78a6..d83f44737e 100644
--- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
@@ -24,7 +24,7 @@
    parse_urls="false"
    use_ellipses="true"
    name="item_name"
-   text_color="white"
+   text_color="White"
    top="5"
    value="..."
    width="359" />
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
index 6c60624805..8c805da048 100644
--- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
@@ -9,7 +9,7 @@
  width="380">
   <item_icon
     height="16"
-    color="0.75 0.75 0.75 1"
+    color="LtGray"
     follows="top|left"
     image_name="Inv_Object"
     layout="topleft"
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 3e2202b20f..0586119681 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -11,7 +11,7 @@ label_pad_left - padding to the left of tab button labels
                halign="center"
                font="SansSerifSmall" 
                tab_height="21"
-               label_pad_bottom="2"
+               label_pad_bottom="1"
                label_pad_left="4">
   <!--
   Possible additional attributes for tabs:
-- 
cgit v1.2.3