From a241f2fd70a524821ed8b0bf60e17cb576cf18f1 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Tue, 18 Oct 2011 16:42:23 -0700
Subject: sync with viewer-development (FUI merge)

---
 .../newview/skins/default/xui/en/floater_about.xml |   1 +
 .../skins/default/xui/en/floater_about_land.xml    |   1 +
 .../skins/default/xui/en/floater_activeim.xml      |   2 -
 .../skins/default/xui/en/floater_avatar.xml        |  24 +
 .../skins/default/xui/en/floater_avatar_picker.xml |   1 +
 .../skins/default/xui/en/floater_camera.xml        |  10 +-
 .../skins/default/xui/en/floater_chat_bar.xml      |  75 +++
 .../skins/default/xui/en/floater_critical.xml      |   2 +-
 .../skins/default/xui/en/floater_destinations.xml  |  26 +
 .../skins/default/xui/en/floater_gesture.xml       |   2 +
 .../skins/default/xui/en/floater_help_browser.xml  |   3 +-
 .../skins/default/xui/en/floater_how_to.xml        |  17 +
 .../skins/default/xui/en/floater_im_session.xml    |   2 -
 .../skins/default/xui/en/floater_inventory.xml     |  28 --
 .../xui/en/floater_inventory_item_properties.xml   |   1 -
 .../skins/default/xui/en/floater_land_holdings.xml |   1 +
 indra/newview/skins/default/xui/en/floater_map.xml |  31 +-
 .../skins/default/xui/en/floater_media_browser.xml |   1 -
 .../default/xui/en/floater_media_settings.xml      |   1 -
 .../skins/default/xui/en/floater_model_preview.xml |   2 +-
 .../skins/default/xui/en/floater_moveview.xml      |   8 +-
 .../skins/default/xui/en/floater_my_appearance.xml |  24 +
 .../skins/default/xui/en/floater_my_inventory.xml  |  21 +
 .../skins/default/xui/en/floater_nearby_chat.xml   |  50 --
 .../default/xui/en/floater_outfit_save_as.xml      |   2 +-
 .../skins/default/xui/en/floater_people.xml        |  44 ++
 .../newview/skins/default/xui/en/floater_picks.xml |  20 +
 .../skins/default/xui/en/floater_places.xml        |  23 +
 .../skins/default/xui/en/floater_postcard.xml      |   1 -
 .../skins/default/xui/en/floater_preferences.xml   |   3 +-
 .../default/xui/en/floater_preview_animation.xml   |   1 -
 .../default/xui/en/floater_preview_gesture.xml     |   3 +-
 .../default/xui/en/floater_preview_notecard.xml    |   1 -
 .../skins/default/xui/en/floater_preview_sound.xml |   1 -
 .../default/xui/en/floater_preview_texture.xml     |   1 -
 .../skins/default/xui/en/floater_script.xml        |   2 -
 .../default/xui/en/floater_script_preview.xml      |   1 -
 .../skins/default/xui/en/floater_script_queue.xml  |   1 -
 .../skins/default/xui/en/floater_search.xml        |  18 +-
 .../skins/default/xui/en/floater_snapshot.xml      |   3 +-
 .../skins/default/xui/en/floater_sound_devices.xml |   2 +-
 .../skins/default/xui/en/floater_sys_well.xml      |   3 +-
 .../skins/default/xui/en/floater_telehub.xml       |   1 -
 .../skins/default/xui/en/floater_test_button.xml   |   1 -
 .../skins/default/xui/en/floater_test_toolbar.xml  |  62 +++
 .../newview/skins/default/xui/en/floater_tools.xml |   4 +-
 .../skins/default/xui/en/floater_toybox.xml        | 102 ++++
 .../default/xui/en/floater_voice_controls.xml      |  11 +-
 .../skins/default/xui/en/floater_web_content.xml   |   1 -
 .../skins/default/xui/en/floater_web_profile.xml   |   6 +
 .../skins/default/xui/en/floater_world_map.xml     |   2 +-
 indra/newview/skins/default/xui/en/main_view.xml   | 202 +++-----
 .../skins/default/xui/en/menu_bottomtray.xml       |   2 +-
 .../skins/default/xui/en/menu_hide_navbar.xml      |  13 +-
 indra/newview/skins/default/xui/en/menu_login.xml  |  10 +-
 .../skins/default/xui/en/menu_mode_change.xml      |  24 -
 .../xui/en/menu_people_friends_view_sort.xml       |   2 +-
 .../xui/en/menu_people_nearby_view_sort.xml        |   2 +-
 .../xui/en/menu_people_recent_view_sort.xml        |   2 +-
 .../newview/skins/default/xui/en/menu_toolbars.xml |  29 ++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 325 ++++++-------
 .../newview/skins/default/xui/en/notifications.xml |  41 +-
 .../skins/default/xui/en/outfit_accordion_tab.xml  |   2 +-
 .../skins/default/xui/en/panel_bottomtray.xml      | 530 ---------------------
 .../skins/default/xui/en/panel_chiclet_bar.xml     | 176 +++++++
 indra/newview/skins/default/xui/en/panel_login.xml |  27 --
 indra/newview/skins/default/xui/en/panel_me.xml    |  45 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  | 155 +++---
 .../skins/default/xui/en/panel_nearby_chat.xml     |  35 ++
 .../skins/default/xui/en/panel_pick_info.xml       |   2 +-
 indra/newview/skins/default/xui/en/panel_picks.xml |  17 +-
 .../default/xui/en/panel_preferences_move.xml      |  18 +-
 .../skins/default/xui/en/panel_side_tray.xml       | 174 -------
 .../skins/default/xui/en/panel_status_bar.xml      |  60 +--
 indra/newview/skins/default/xui/en/panel_toast.xml |   1 +
 .../skins/default/xui/en/panel_toolbar_view.xml    | 164 +++++++
 .../skins/default/xui/en/sidepanel_inventory.xml   |  16 +-
 indra/newview/skins/default/xui/en/strings.xml     |  73 ++-
 .../skins/default/xui/en/widgets/button.xml        |   7 +-
 .../skins/default/xui/en/widgets/floater.xml       |   4 +-
 .../skins/default/xui/en/widgets/toolbar.xml       |  53 +++
 81 files changed, 1439 insertions(+), 1426 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_avatar.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_chat_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_destinations.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_how_to.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_appearance.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_inventory.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_nearby_chat.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_people.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_picks.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_places.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_test_toolbar.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_toybox.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_web_profile.xml
 delete mode 100644 indra/newview/skins/default/xui/en/menu_mode_change.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_toolbars.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_bottomtray.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_nearby_chat.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_side_tray.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_toolbar_view.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/toolbar.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 2580c06344..36af475824 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="centered"
  legacy_header_height="18"
  height="440"
  layout="topleft"
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 e5dcc9bcb5..eaffbf5fa6 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  can_tear_off="false"
  height="420"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index 96fe0aa70c..670c528f08 100644
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -4,8 +4,6 @@
 	name="floater_activeim"
 	help_topic="floater_activeim"
 	title="ACTIVE IM"
-	top="26"
-	left="0"
 	height="22"
 	width="320"
 	follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
new file mode 100644
index 0000000000..3c7de6f334
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="225"
+ can_minimize="true"
+ can_close="true"
+ can_resize="true"
+ min_height="230"
+ min_width="450"
+ height="230"
+ layout="topleft"
+ name="Avatar"
+ single_instance="true"
+ help_topic="avatar"
+ save_rect="true"
+ title="AVATAR PICKER"
+ width="635">
+    <web_browser
+      top="25"
+      height="200"
+      width="635"
+      follows="all"
+      name="avatar_picker_contents"
+      trusted_content="true"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index a11946d352..cbbbeb6094 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  legacy_header_height="18"
  can_resize="true"
  height="350"
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index da2be18db6..afe8584a2d 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="specified"
+ specified_left="320"
+ specified_bottom="80"
  legacy_header_height="18"
- can_dock="true"
  can_minimize="true"
- can_close="false"
+ can_close="true"
  follows="bottom"
  height="164"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
- save_rect="true"
  save_visibility="true"
- save_dock_state="true"
  single_instance="true"
+ title="VIEW"
+ save_rect="true"
  width="228">
     <floater.string
      name="rotate_tooltip">
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
new file mode 100644
index 0000000000..989b4a0580
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ open_positioning="specified"
+ specified_left="320"
+ specified_bottom="10"
+ height="60"
+ layout="topleft"
+ legacy_header_height="25"
+ single_instance="true"
+ title="NEARBY CHAT"
+ save_rect="true"
+ can_close="true"
+ can_minimize="true"
+ help_topic="chat_bar"
+ min_height="60"
+ min_width="150"
+ can_resize="true"
+ name="chat_bar"
+ width="380">
+    <panel
+        top="20"
+        class="panel_nearby_chat"
+        follow="all"
+        width="380"
+        height="0"
+        visible="false"
+        filename="panel_nearby_chat.xml"
+        name="nearby_chat" />
+    <panel width="380" height="31" left="0" bottom="-1" follows="left|right|bottom">
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|right"
+     height="23"
+     label="Click here to chat."
+     layout="topleft"
+     left_delta="7"
+     left="0"
+     max_length_bytes="1023"
+     name="chat_box"
+     text_pad_left="5"
+     text_pad_right="25"
+     tool_tip="Press Enter to say, Ctrl+Enter to shout"
+     top="2"
+     width="335" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     height="16"
+     layout="topleft"
+     left_pad="-24"
+     mouse_opaque="true"
+     name="chat_zone_indicator"
+     top="6"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     is_toggle="true"
+     width="20"
+     top="2"
+     layout="topleft"
+     left_pad="12"
+     image_disabled="ComboButton_UpOff"
+     image_unselected="ComboButton_UpOff"
+     image_selected="ComboButton_On"
+     image_pressed="ComboButton_UpSelected"
+     image_pressed_selected="ComboButton_Selected"
+     height="23"
+     name="show_nearby_chat"
+     tool_tip="Shows/hides nearby chat log">
+    </button>
+    </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 05c958e051..13b15bf724 100644
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
@@ -6,7 +6,7 @@
  height="500"
  layout="topleft"
  name="modal container"
- open_centered="true"
+ open_positioning="centered"
  width="600">
     <button
      height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
new file mode 100644
index 0000000000..e63dc02a57
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ open_positioning="cascading"
+ legacy_header_height="225"
+ can_minimize="true"
+ can_close="true"
+ user_resize="true"
+ can_resize="true"
+ min_height="230"
+ min_width="350"
+ height="230"
+ layout="topleft"
+ name="Destinations"
+ single_instance="true"
+ help_topic="destinations"
+ save_rect="true"
+ title="DESTINATIONS"
+ width="840">
+    <web_browser
+      top="25"
+      height="200"
+      width="840"
+      follows="all"
+      name="destination_guide_contents"
+      trusted_content="true"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 9f5e6828d2..a941734358 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
+ save_rect="true"
  legacy_header_height="18"
  can_resize="true"
  height="465"
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index de6d586f72..d101bca694 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  legacy_header_height="18"
  can_resize="true"
- left="10000"
- bottom="10000"
  height="600"
  layout="topleft"
  min_height="150"
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
new file mode 100644
index 0000000000..0369ecbeff
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_how_to.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  can_minimize="true" 
+  height="775"
+  layout="topleft"
+  min_height="360"
+  left="10000"
+  top="10" 
+  min_width="335"
+  name="floater_how_to"
+  single_instance="true"
+  save_rect="true"
+  title="HOW TO"
+  width="780"
+  filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index a371e98322..cb7d91abb8 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -6,9 +6,7 @@
  follows="all"
  height="350"
  layout="topleft"
- left="0"
  name="panel_im"
- top="0"
  can_dock="false"
  can_minimize="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
deleted file mode 100644
index ba2e0d3277..0000000000
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- auto_tile="true"
- can_resize="true"
- height="563"
- layout="topleft"
- min_height="150"
- min_width="240"
- name="Inventory"
- help_topic="inventory"
- save_rect="true"
- save_visibility="true"
- single_instance="false"
- title="MY INVENTORY"
- width="467">
-    <panel
-     bottom="560"
-	 class="panel_main_inventory"
-	 filename="panel_main_inventory.xml"
-	 follows="all"
-	 layout="topleft"
-	 left="0"
-	 label="Inventory Panel"
-	 name="Inventory Panel"
-	 top="15"
-	 width="467" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 0cf07926c2..adef066aef 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  height="340"
  layout="topleft"
  name="item properties"
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 0b9ae3c9f3..3737294ebe 100644
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="centered"
  legacy_header_height="18"
  height="430"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index ae99fa8dd5..58d67c8221 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- bg_alpha_image_overlay="DkGray_66"
- legacy_header_height="0"
+ open_positioning="cascading"
  can_minimize="true" 
  can_resize="true"
  follows="top|right"
- height="174"
+ height="200"
  layout="topleft"
  min_height="128"
  min_width="128"
  name="Map"
- title=""
+ title="MINI-MAP"
  help_topic="map"
  save_rect="true"
  save_visibility="true"
- single_instance="true"
- left="0"
- top="0"
  width="200">
     <floater.string
      name="ToolTipMsg">
@@ -27,17 +23,16 @@
 		[REGION](Double-click to teleport, shift-drag to pan)
 	</floater.string>
 	<floater.string name="mini_map_caption">
-	MINIMAP
+	Mini-map
     </floater.string>
     <net_map
-     bg_color="NetMapBackgroundColor"
      follows="top|left|bottom|right"
      layout="topleft"
      left="0"
      mouse_opaque="false"
      name="Net Map"
      width="200"
-     height="218"
+     height="200"
      top="0"/>
     <text
      type="string"
@@ -49,7 +44,7 @@
      name="floater_map_north"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         N
     </text>
     <text
@@ -62,7 +57,7 @@
      name="floater_map_east"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         E
     </text>
     <text
@@ -75,7 +70,7 @@
      name="floater_map_west"
      right="11"
      text_color="1 1 1 0.7"
-     top="195">
+     top="175">
         W
     </text>
     <text
@@ -88,7 +83,7 @@
      name="floater_map_south"
      right="10"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         S
     </text>
     <text
@@ -101,7 +96,7 @@
      name="floater_map_southeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SE
     </text>
     <text
@@ -114,7 +109,7 @@
      name="floater_map_northeast"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NE
     </text>
     <text
@@ -127,7 +122,7 @@
      name="floater_map_southwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         SW
     </text>
     <text
@@ -140,7 +135,7 @@
      name="floater_map_northwest"
      right="20"
      text_color="1 1 1 0.7"
-     top="209">
+     top="189">
         NW
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 5a1f920398..c3324a6aa4 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -9,7 +9,6 @@
  name="floater_about"
  help_topic="floater_about"
  save_rect="true"
- auto_tile="true"
  title="MEDIA BROWSER"
  width="820">
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
index 681731b0da..0e03c0ab6d 100644
--- a/indra/newview/skins/default/xui/en/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml
@@ -10,7 +10,6 @@
  enabled="true"
  width="365" 
  height="535" 
- left="330" 
  min_height="535" 
  min_width="365"
  mouse_opaque="true" 
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 2eea286c8b..fbaf4f0a8a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="480" min_height="480" min_width="940"
-     name="Model Preview" title="Upload Model" width="940"
+     name="Model Preview" title="UPLOAD MODEL" width="940"
       help_topic="upload_model" >
 
   <string name="status_idle"></string>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 6f29255a6b..b7370580af 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="specified"
+ specified_left="558"
+ specified_bottom="80"
  legacy_header_height="18"
- can_dock="true"
+ can_dock="false"
  can_minimize="true"
- can_close="false"
+ can_close="true"
  follows="bottom"
  height="110"
  layout="topleft"
@@ -12,6 +15,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
+ title="MOVE"
  width="133">
     <string
      name="walk_forward_tooltip">
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
new file mode 100644
index 0000000000..d9f3f1e13f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<floater
+  open_positioning="cascading"
+  legacy_header_height="18"
+  can_resize="true"
+  height="588"
+  layout="topleft"
+  name="floater_my_appearance"
+  help_topic="appearance"
+  save_rect="true"
+  single_instance="true"
+  title="APPEARANCE"
+  min_height="260"
+  min_width="333"
+  width="333">
+    <panel
+      top="18"
+      class="sidepanel_appearance"
+      name="main_panel"
+      filename="sidepanel_appearance.xml"
+      label="Edit Appearance"
+      font="SansSerifBold"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
new file mode 100644
index 0000000000..44491c671f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ open_positioning="cascading"
+ can_close="true"
+ can_resize="true"
+ height="570"
+ help_topic="sidebar_inventory"
+ min_width="333"
+ min_height="440"
+ name="floater_my_inventory"
+ save_rect="true"
+ save_visibility="true"
+ title="INVENTORY"
+ width="333" >
+   <panel
+    class="sidepanel_inventory"
+    name="main_panel"
+    filename="sidepanel_inventory.xml"
+    follows="all"
+    top="0"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
deleted file mode 100644
index ab966dbb0e..0000000000
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- border_visible="false"
- border="false"
- legacy_header_height="18"
- can_minimize="true"
- can_tear_off="false"
- can_resize="true"
- can_drag_on_left="false"
- can_close="false"
- can_dock="true"
- bevel_style="in"
- height="300"
- min_width="235"
- layout="topleft"
- name="nearby_chat"
- help_topic="nearby_chat"
- save_rect="true"
- title="NEARBY CHAT"
- save_dock_state="true"
- save_visibility="true"
- single_instance="true"
- width="320">
-            <check_box
-             bottom_delta="36"
-             control_name="TranslateChat"
-             enabled="true"
-             height="16"
-             label="Translate chat (powered by Google)"
-             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" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
index 068737494f..bbe280582b 100644
--- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
@@ -4,7 +4,7 @@
  can_minimize="false"
  height="100"
  layout="topleft"
- title="Save Outfit"
+ title="SAVE OUTFIT"
  name="modal container"
  width="240">
     <button
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
new file mode 100644
index 0000000000..9c1d121433
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+  open_positioning="cascading"
+  can_close="true"
+  can_resize="true"
+  height="570"
+  help_topic="sidebar_people"
+  min_height="440"
+  min_width="333"
+  layout="topleft"
+  name="floater_people"
+  save_rect="true"
+  single_instance="true"
+  title="PEOPLE"
+  width="333">
+    <panel_container
+      default_panel_name="panel_people"
+      follows="all"
+      height="570"
+      name="main_panel"
+      width="333">
+      <panel
+        class="panel_people"
+        name="panel_people"
+        filename="panel_people.xml"/>
+      <panel
+        class="panel_profile_view"
+        name="panel_profile_view"
+        filename="panel_profile_view.xml"/>
+      <panel
+        class="panel_group_info_sidetray"
+        name="panel_group_info_sidetray"
+        filename="panel_group_info_sidetray.xml"
+        label="Group Profile"
+        font="SansSerifBold"/>
+      <panel
+        class="panel_block_list_sidetray"
+        name="panel_block_list_sidetray"
+        filename="panel_block_list_sidetray.xml"
+        label="Blocked Residents &amp; Objects"
+        font="SansSerifBold"/>
+    </panel_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
new file mode 100644
index 0000000000..2d307028e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_picks.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ open_positioning="cascading"
+ can_close="true"
+ can_resize="true"
+ height="572"
+ help_topic="sidebar_me"
+ min_width="333"
+ min_height="440"
+ name="floater_picks"
+ save_rect="true"
+ save_visibility="true"
+ title="Picks"
+ width="333" >
+   <panel
+    class="panel_me"
+    name="main_panel"
+    filename="panel_me.xml"
+    follows="all"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
new file mode 100644
index 0000000000..b7cb86b468
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_places.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<floater
+  open_positioning="cascading"
+  legacy_header_height="18"
+  can_resize="true"
+  height="588"
+  layout="topleft"
+  name="floater_places"
+  help_topic="floater_places"
+  save_rect="true"
+  title="PLACES"
+  min_height="230"
+  min_width="333"
+  width="333">
+    <panel
+      top="18"
+      class="panel_places"
+      name="main_panel"
+      filename="panel_places.xml"
+      label="Places"
+      font="SansSerifBold"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml
index c756661ffc..adc2433105 100644
--- a/indra/newview/skins/default/xui/en/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/en/floater_postcard.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  can_minimize="false"
  can_resize="true"
  height="380"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index dcfa8bc060..402868bb97 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- open_centered="true"
+ open_positioning="centered"
  default_tab_group="1"
  height="460"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
+ save_rect="true"
  single_instance="true"
  title="PREFERENCES"
  width="658">
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 65efc46c71..8427c7b06f 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  height="85"
  layout="topleft"
  name="preview_anim"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 478ae5f53f..8baa0a56f7 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  height="460"
  layout="topleft"
  name="gesture_preview"
@@ -362,4 +361,4 @@
      name="save_btn"
      top_delta="0"
      width="80" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 8c9e1d52b3..f35628f8e5 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  can_resize="true"
  default_tab_group="1"
  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 62ef4c3097..83a1f5a96f 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  height="85"
  layout="topleft"
  name="preview_sound"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index a79d2f63cb..92d3a6702c 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  can_resize="true"
  follows="left|top"
  height="350"
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index 12ade86b5f..73e6d6147a 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -5,9 +5,7 @@
  follows="left|top|right|bottom"
  height="250"
  layout="topleft"
- left="0"
  name="script_floater"
- top="0"
  can_dock="true"
  can_minimize="true"
  visible="false" 
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 8c03b56040..91a9e67e4c 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  can_resize="true"
  height="570"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
index 60a26fcf1d..f4aca7bb3d 100644
--- a/indra/newview/skins/default/xui/en/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- auto_tile="true"
  can_resize="true"
  height="400"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index eaf575fc08..dd818e2e06 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+  open_positioning="cascading"
   legacy_header_height="18"
- can_resize="true"
+  can_resize="true"
   height="775"
- layout="topleft"
- min_height="400"
+  layout="topleft"
+  min_height="400"
   min_width="500"
-  name="floater_web_content"
-  help_topic="floater_web_content"
- save_rect="true"
-  auto_tile="true"
- save_visibility="true"
+  name="floater_search"
+  help_topic="floater_search"
+  save_rect="true"
+  save_visibility="true"
   title=""
   initial_mime_type="text/html"
   width="780"
-             tab_stop="true"
+  tab_stop="true"
   filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 89a0c4c287..91b4ed6954 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  legacy_header_height="18"
- can_minimize="false"
+ can_minimize="true"
  can_close="true"
  follows="left|top"
  height="520"
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
index 74e01f359c..3dbe4adf28 100644
--- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
@@ -14,7 +14,7 @@
  height="164"
  layout="topleft"
  name="floater_sound_devices"
- title="Sound Devices"
+ title="SOUND DEVICES"
  width="490">
   <panel
     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 005952f3f2..9b96a5badc 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -2,8 +2,6 @@
 <floater
  legacy_header_height="18"
  bevel_style="in"
- left="0"
- top="0"
  follows="right|bottom"
  layout="topleft"
  name="sys_well_window"
@@ -18,6 +16,7 @@
  can_resize="true"
  can_drag_on_left="false"
  can_dock="true"
+ save_dock_state="true"
  save_visibility="true"
  single_instance="true"
 >
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index da412ed8a0..547613fb67 100644
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
@@ -4,7 +4,6 @@
  legacy_header_height="18"
  height="250"
  layout="topleft"
- left="300" 
  name="telehub"
  help_topic="telehub"
  title="TELEHUB"
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
index bf0a774e76..9bc05107a2 100644
--- a/indra/newview/skins/default/xui/en/floater_test_button.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_button.xml
@@ -78,7 +78,6 @@
     <button
      bottom_delta="30"
      height="23"
-     highlight_color="EmphasisColor"
      label="Highlight"
      layout="topleft"
      name="highlight_color_button" />
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
new file mode 100644
index 0000000000..067c1fed82
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="500"
+ layout="topleft"
+ name="floater_test_toolbar"
+ translate="false"
+ width="500">
+  <toolbar name="test_toolbar_top"
+           button_display_mode="icons_with_text"
+           follows="left|right|top"
+           height="50"
+           width="500"
+           left="0"
+           top="20"
+           min_button_width="0"
+           max_button_width="100"
+           side="top">
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
+  </toolbar>
+  <toolbar name="test_toolbar_left"
+           button_display_mode="icons_with_text"
+           follows="left|bottom|top"
+           height="380"
+           width="200"
+           left="0"
+           top="70"
+           min_button_width="100"           
+           side="left">
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
+  </toolbar>
+  <toolbar name="test_toolbar_right"
+           button_display_mode="icons_with_text"
+           follows="right|bottom|top"
+           height="380"
+           width="200"
+           right="500"
+           top="70"
+           side="right">
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
+  </toolbar>
+  <toolbar name="test_toolbar_bottom"
+           button_display_mode="icons_with_text"
+           follows="left|right|bottom"
+           height="50"
+           width="500"
+           left="0"
+           bottom="500"
+           min_button_width="100"
+           side="bottom">
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
+  </toolbar>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 9b02f7d273..1808cab2a5 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  legacy_header_height="18"
  follows="left|top|right"
  height="580"
@@ -515,7 +516,8 @@
      image_disabled_selected="Object_Grass"
      image_selected="Object_Grass_Selected"
      image_unselected="Object_Grass"
-     image_overlay_color="Red"
+     image_overlay_color="1 0 0 .75"
+     image_overlay_selected_color="1 0 0 1"
      layout="topleft"
      left_delta="29"
      name="ToolGrass"
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
new file mode 100644
index 0000000000..c7e09bf45e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  can_close="true"
+  can_dock="false"
+  can_minimize="false"
+  can_resize="false"
+  default_tab_group="1"
+  height="460"
+  help_topic="toybox"
+  layout="topleft"
+  legacy_header_height="18"
+  name="Toybox"
+  open_positioning="centered"
+  save_rect="true"
+  single_instance="true"
+  title="CUSTOMIZE TOOLBARS"
+  width="650">
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    valign="bottom"
+    halign="left"
+    height="20"
+    layout="topleft"
+    left="20"
+    length="1"
+    name="toybox label 1"
+    right="-20"
+    top="35"
+    type="string">
+      Add or remove buttons by dragging them to or from the toolbars.
+  </text>
+  <text
+    follows="left|top"
+    font="SansSerifMedium"
+    valign="bottom"
+    halign="left"
+    height="20"
+    layout="topleft"
+    left="20"
+    length="1"
+    name="toybox label 2"
+    right="-20"
+    top="55"
+    type="string">
+      Buttons will appear as shown or as icon-only depending on each toolbar's settings.
+  </text>
+  <toolbar
+    bottom="395"
+    button_display_mode="icons_with_text"
+    follows="all"
+    left="20"
+    button_icon_and_text.button_width.max="140"
+    button_icon_and_text.button_width.min="70"
+    name="toybox_toolbar"
+    pad_left="5"
+    pad_right="5"
+    pad_top="5"
+    pad_bottom="5"
+    pad_between="15"
+    read_only="true"
+    right="-20"
+    side="top"
+    top="85">
+    <button_panel background_visible="false" />
+    <button_icon_and_text image_unselected="PushButton_Off"
+                          image_selected="PushButton_Off"
+                          image_disabled_selected="PushButton_Disabled"
+                          image_disabled="PushButton_Disabled"
+                          label_color="ButtonLabelColor"
+                          label_color_selected="ButtonLabelColor"
+                          label_color_disabled="ButtonLabelDisabledColor"
+                          label_color_disabled_selected="ButtonLabelDisabledColor"
+                          image_color="ButtonImageColor"
+                          image_color_disabled="ButtonImageColor"
+                          flash_color="ButtonUnselectedFgColor"
+                          halign="left"
+                          hover_glow_amount="0.15"
+                          sound_flags="0"
+                          display_pressed_state="false" />
+  </toolbar>
+  <panel
+    bevel_style="none"
+    border="true"
+    bottom="396"
+    follows="left|bottom|right"
+    left="20"
+    right="-20"
+    top="396" />
+  <button
+    follows="left|bottom|right"
+    height="23"
+    label="Restore defaults"
+    label_selected="Restore defaults"
+    layout="topleft"
+    left="260"
+    name="btn_restore_defaults"
+    top="415"
+    width="130">
+    <button.commit_callback function="Toybox.RestoreDefaults" />
+  </button>
+</floater>
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 f017a7ace6..3f5768bc0b 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ open_positioning="cascading"
  can_resize="true"
  can_minimize="true"
- can_close="false"
+ can_close="true"
  height="205"
  layout="topleft"
  min_height="124"
  min_width="190"
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
- title="Voice Controls"
+ title="VOICE CONTROLS"
  save_dock_state="true"
  save_visibility="true"
  save_rect="true"
@@ -17,15 +18,15 @@
  width="282">
     <string
      name="title_nearby">
-        NEARBY VOICE
+        Nearby voice
     </string>
     <string
      name="title_group">
-        Group Call with [GROUP]
+        Group call with [GROUP]
     </string>
     <string
      name="title_adhoc">
-        Conference Call
+        Conference call
     </string>
     <string
      name="title_peer_2_peer">
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 0eda9ae62a..57d1c92acb 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -9,7 +9,6 @@
   name="floater_web_content"
   help_topic="floater_web_content"
   save_rect="true"
-  auto_tile="true"
   title=""
   initial_mime_type="text/html"
   width="780">
diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml
new file mode 100644
index 0000000000..d0225f78a9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_web_profile"
+         help_topic="web_profile"
+         width="780"
+         height="775"
+         filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 019e7cd032..4314c8a9e2 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- open_centered="true"
+ open_positioning="centered"
  height="600"
  layout="topleft"
  min_height="520"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a7d1aa963c..b4be17e677 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -11,130 +11,68 @@
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="749"
+                height="768"
                 name="menu_stack"
                 orientation="vertical"
-                top="19">
+                top="0">
+    <layout_panel mouse_opaque="true"
+              follows="left|right|top"
+              name="status_bar_container"
+              tab_stop="false"
+              height="19"
+              left="0"
+              top="0"
+              width="1024"
+              user_resize="false"
+              auto_resize="false"
+              visible="true">
+      <view mouse_opaque="false"
+            follows="all"
+            name="menu_bar_holder"
+            left="0"
+            top="0"
+            width="1024"
+            height="19"/>
+    </layout_panel>
     <layout_panel auto_resize="false"
-                  height="60"
+                  height="34"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
                   width="1024"
-                  user_resize="false" 
-                  visible="false">
-    </layout_panel>
-    <layout_panel auto_resize="true"
+                  user_resize="false"
+                  visible="false"/>
+    <layout_panel auto_resize="true"  
                   follows="all"
                   height="500"
                   layout="topleft"
                   mouse_opaque="false"
                   tab_stop="false" 
-                  name="hud"
+                  name="world_panel"
                   width="1024">
-      <layout_stack border_size="0"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="hud_stack"
-                    orientation="horizontal"
-                    top="0"
-                    width="1024">
-        <layout_panel auto_resize="true"
-               follows="all"
-               height="500"
-               layout="topleft"
-               mouse_opaque="false"
-               tab_stop="false"
-               name="non_side_tray_view"
-               user_resize="false"
-               width="500">
-          <view bottom="500"
-                follows="all"
-                height="500"
-                left="0"
-                mouse_opaque="false"
-                name="world_view_rect"
-                width="500"/>
-          <layout_stack border_size="0"
-                        bottom="500"
-                        follows="all"
-                        height="500"
-                        left="0"
-                        mouse_opaque="false"
-                        name="world_stack"
-                        orientation="vertical">
-            <layout_panel auto_resize="true"
-                          follows="all"
-                          height="500"
-                          layout="topleft"
-                          tab_stop="false"
-                          mouse_opaque="false"
-                          user_resize="false" 
-                          name="hud container"
-                          width="500">
-              <view top="0"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="floater_snap_region"
-                    width="500"/>
-              <panel follows="left|top"
-                     height="19"
-                     left="0"
-                     mouse_opaque="false"
-                     name="topinfo_bar_container"
-                     tab_stop="false"
-                     top="0"
-                     visible="false"
-                     width="1024"/>
-              <panel follows="right|top|bottom"
-                     height="500"
-                     mouse_opaque="false"
-                     name="side_bar_tabs"
-                     right="500"
-                     tab_stop="false"
-                     top="0"
-                     width="32"/>
-              <panel bottom="500"
-                     follows="left|right|bottom"
-                     height="25"
-                     left="0"
-                     mouse_opaque="false"
-                     tab_stop="false"
-                     name="stand_stop_flying_container"
-                     visible="false"
-                     width="500"/>
-            </layout_panel>
-            <layout_panel auto_resize="false"
-                   min_height="33"
-                   height="33" 
-                   mouse_opaque="false"
-                   name="bottom_tray_container"
-                   visible="false"/>
-          </layout_stack>
-        </layout_panel>
-        <!-- side tray -->
-        <layout_panel auto_resize="false"
-                      follows="top|bottom"
-                      height="500"
-                      min_width="333"
-                      mouse_opaque="false"
-                      tab_stop="false"
-                      name="side_tray_container"
-                      user_resize="false"
-                      visible="false"
-                      width="333"/>
-      </layout_stack>
+      <view top="0"
+            follows="all"
+            height="500"
+            left="0"
+            mouse_opaque="false"
+            name="world_view_rect"
+            width="1024"/>
+      <panel follows="left|top|right"
+             height="19"
+             left="0"
+             mouse_opaque="false"
+             name="topinfo_bar_container"
+             tab_stop="false"
+             top="0"
+             visible="false"
+             width="1024"/>
       <panel top="0"
-         follows="all"
-         height="500"
-         mouse_opaque="false"
-         name="login_panel_holder"
-         width="1024"/>
-
+             left="0"
+             follows="all"
+             height="500"
+             mouse_opaque="false"
+             name="login_panel_holder"
+             width="1024"/>
       <debug_view follows="all"
                   left="0"
                   top="0"
@@ -142,45 +80,27 @@
                   height="500"
                   name="DebugView"
                   width="1024"/>
-
-      <panel follows="all"
+      <floater_view follows="all"
                     height="500"
                     left="0"
                     mouse_opaque="false"
-                    name="floater_view_holder"
+                    name="Floater View"
                     tab_group="-1"
                     tab_stop="false"
                     top="0"
-                    width="1024">
-        <floater_view follows="all"
-                      height="500"
-                      left="0"
-                      mouse_opaque="false"
-                      name="Floater View"
-                      tab_group="-1"
-                      tab_stop="false"
-                      top="0"
-                      width="1024"/>
-      </panel>
+                    width="1024"/>
+      <panel name="toolbar_view_holder"
+             follows="all"
+             layout="topleft"
+             height="500"
+             width="1024"
+             top="0"
+             left="0"
+             mouse_opaque="false"
+             tab_stop="false"/>
     </layout_panel>
   </layout_stack>
-  <panel mouse_opaque="false"
-         follows="left|right|top"
-         name="status_bar_container"
-         tab_stop="false"
-         height="19"
-         left="0" 
-         top="0" 
-         width="1024"
-         visible="false"/>
-  
-  <view mouse_opaque="false"
-        follows="all"
-        name="menu_bar_holder"
-        left="0"
-        top="0"
-        width="1024"
-        height="768"/>
+ 
   <panel top="0"
         follows="all"
         mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index 07dabe1909..1a102c21bb 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -97,7 +97,7 @@
          parameter="ShowWorldMapButton" />
     </menu_item_check>
     <menu_item_check
-     label="Mini-Map button"
+     label="Mini-map button"
      layout="topleft"
      name="ShowMiniMapButton">
         <menu_item_check.on_click
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index 3f38d734b9..b517fd7957 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -9,7 +9,7 @@
  visible="false"
  width="128">
     <menu_item_check
-         label="Show Navigation Bar"
+         label="Show Navigation &amp; Favorites Bar"
          layout="topleft"
          name="ShowNavbarNavigationPanel">
            <on_click
@@ -19,17 +19,6 @@
              function="CheckControl"
              parameter="ShowNavbarNavigationPanel" />
     </menu_item_check>
-    <menu_item_check
-         label="Show Favorites Bar"
-         layout="topleft"
-         name="ShowNavbarFavoritesPanel">
-           <on_click
-             function="ToggleControl"
-             parameter="ShowNavbarFavoritesPanel" /> 
-             <on_check
-             function="CheckControl"
-             parameter="ShowNavbarFavoritesPanel" />
-    </menu_item_check>
     <menu_item_check
          label="Show Mini-Location Bar"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 4c4ff3e5c4..80e310a873 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -13,7 +13,7 @@
      tear_off="true"
      name="File">
         <menu_item_call
-         label="Preferences"
+         label="Preferences..."
          name="Preferences..."
          shortcut="control|P">
             <menu_item_call.on_click
@@ -93,14 +93,6 @@
              parameter="ui_preview" />
         </menu_item_call>
       <menu_item_separator />
-      <!-- Broken
-      <menu_item_call
-         label="Show Side Tray"
-         name="Show Side Tray">
-        <menu_item_call.on_click
-         function="Advanced.ShowSideTray" />
-      </menu_item_call>
-      -->
       <menu
        create_jump_keys="true"
        label="UI Tests"
diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml
deleted file mode 100644
index 87d1a0a7a2..0000000000
--- a/indra/newview/skins/default/xui/en/menu_mode_change.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- name="Mode Change">
-  <menu_item_check
-   label="Basic"
-   name="BasicMode">
-    <on_check
-         function="CheckSessionSettings"
-         parameter="settings_minimal.xml" />
-    <on_click
-      function="ChangeMode"
-      parameter="basic"/>
-  </menu_item_check>
-    <menu_item_check
-     label="Advanced"
-     name="AdvancedMode">
-    <on_check
-     function="CheckSessionSettings"
-     parameter="" />
-    <on_click
-      function="ChangeMode"
-      parameter="advanced"/>
-    </menu_item_check>
-  </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index 29eeb93ac1..b452f96e7a 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -42,6 +42,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 65bd2793b6..614dd693c5 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -52,6 +52,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index 0634e3bd3b..485a5a658c 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -34,6 +34,6 @@
   </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
   </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
new file mode 100644
index 0000000000..59912b5503
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+      layout="topleft"
+      name="Toolbars Popup"
+      visible="false">
+  <menu_item_call label="Choose buttons..."
+                  layout="topleft"
+                  name="Chose Buttons">
+    <menu_item_call.on_click function="Floater.Show"
+                             parameter="toybox" />
+  </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_check label="Icons and labels"
+                   layout="topleft"
+                   name="icons_with_text">
+    <on_click function="Toolbars.EnableSetting"
+              parameter="icons_with_text" />
+    <on_check function="Toolbars.CheckSetting"
+              parameter="icons_with_text" />
+  </menu_item_check>
+  <menu_item_check label="Icons only"
+                   layout="topleft"
+                   name="icons_only">
+    <on_click function="Toolbars.EnableSetting"
+              parameter="icons_only" />
+    <on_check function="Toolbars.CheckSetting"
+              parameter="icons_only" />
+  </menu_item_check>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 16f48f3a4e..63e50b0b9f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -8,169 +8,178 @@
      label="Me"
      name="Me"
      tear_off="true">
-        <menu_item_call
-         label="Preferences"
-         name="Preferences"
-         shortcut="control|P">
-            <menu_item_call.on_click
-             function="Floater.Show"
-             parameter="preferences" />
-        </menu_item_call>
-         <menu_item_call
-             label="My Dashboard"
-             name="Manage My Account">
-                <menu_item_call.on_click
-                 function="PromptShowURL"
-                 name="ManageMyAccount_url"
-                 parameter="WebLaunchJoinNow,http://secondlife.com/account/" />
+      <menu_item_call
+           label="Dashboard..."
+           name="Manage My Account">
+        <menu_item_call.on_click
+         function="PromptShowURL"
+         name="ManageMyAccount_url"
+         parameter="WebLaunchJoinNow,http://secondlife.com/account/" />
       </menu_item_call>
-        <menu_item_call
-         label="Buy L$"
-         name="Buy and Sell L$">
-            <menu_item_call.on_click
-             function="BuyCurrency" />
-        </menu_item_call>
-
-        <menu_item_separator/>
+      <menu_item_call
+       label="Profile..."
+       name="Profile">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+      </menu_item_call>
+      <menu_item_call
+       label="Appearance..."
+       name="ChangeOutfit">
+        <menu_item_call.on_click
+         function="CustomizeAvatar" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+      </menu_item_call>
+      <menu_item_check
+         label="Inventory..."
+         name="Inventory"
+         shortcut="control|I"
+		     visible="true">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="inventory" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="inventory" />
+      </menu_item_check>
+      <menu_item_check
+       label="Gestures..."
+       name="Gestures"
+       shortcut="control|G">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="gestures" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="gestures" />
+      </menu_item_check>
+      <menu_item_check
+       label="Voice..."
+       name="ShowVoice"
+       visibility_control="VoiceMorphingEnabled">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         Parameter="voice_effect" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="voice_effect" />
+      </menu_item_check>
 
+      <menu
+       create_jump_keys="true"
+       label="Movement"
+       name="Movement"
+       tear_off="true">
         <menu_item_call
-         label="My Profile"
-         name="Profile">
-            <menu_item_call.on_click
-             function="ShowAgentProfile"
-             parameter="agent" />
-        </menu_item_call>
-        <menu_item_call
-         label="My Appearance"
-         name="ChangeOutfit">
-            <menu_item_call.on_click
-             function="CustomizeAvatar" />
-            <menu_item_call.on_enable
-             function="Edit.EnableCustomizeAvatar" />
+         label="Sit Down"
+         layout="topleft"
+         shortcut="alt|shift|S"
+         name="Sit Down Here">
+          <menu_item_call.on_click
+           function="Self.SitDown"
+           parameter="" />
+          <menu_item_call.on_enable
+           function="Self.EnableSitDown" />
         </menu_item_call>
         <menu_item_check
-         label="My Inventory"
-         name="Inventory"
-         shortcut="control|shift|I"
-		 visible="false">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="inventory" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="inventory" />
-        </menu_item_check>
-        <menu_item_check
-         label="My Inventory"
-         name="ShowSidetrayInventory"
-         shortcut="control|I"
-		 visible="true">
-            <menu_item_check.on_check
-             function="SidetrayPanelVisible"
-             parameter="sidepanel_inventory" />
-            <menu_item_check.on_click
-             function="ShowSidetrayPanel"
-             parameter="sidepanel_inventory" />
-        </menu_item_check>
-        <menu_item_check
-         label="My Gestures"
-         name="Gestures"
-         shortcut="control|G">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="gestures" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="gestures" />
+         label="Fly"
+         name="Fly"
+         shortcut="Home">
+          <menu_item_check.on_check
+           function="Agent.getFlying" />
+          <menu_item_check.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_check.on_enable
+           function="Agent.enableFlying" />
         </menu_item_check>
         <menu_item_check
-         label="My Voice"
-         name="ShowVoice"
-         visibility_control="VoiceMorphingEnabled">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             Parameter="voice_effect" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="voice_effect" />
+         label="Always Run"
+         name="Always Run"
+         shortcut="control|R">
+          <menu_item_check.on_check
+           function="World.CheckAlwaysRun" />
+          <menu_item_check.on_click
+           function="World.AlwaysRun" />
         </menu_item_check>
-		<menu
-		 create_jump_keys="true"
-		 label="Movement"
-		 name="Movement"
-		 tear_off="true">
-            <menu_item_call
-             label="Sit Down"
-             layout="topleft"
-		     shortcut="alt|shift|S"
-             name="Sit Down Here">
-                <menu_item_call.on_click
-                 function="Self.SitDown"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="Self.EnableSitDown" />
-            </menu_item_call>
-            <menu_item_check
-             label="Fly"
-             name="Fly"
-             shortcut="Home">
-                <menu_item_check.on_check
-                 function="Agent.getFlying" />
-                <menu_item_check.on_click
-                 function="Agent.toggleFlying" />
-                <menu_item_check.on_enable
-                 function="Agent.enableFlying" />
-            </menu_item_check>
-            <menu_item_check
-             label="Always Run"
-             name="Always Run"
-             shortcut="control|R">
-                <menu_item_check.on_check
-                 function="World.CheckAlwaysRun" />
-                <menu_item_check.on_click
-                 function="World.AlwaysRun" />
-            </menu_item_check>
-            <menu_item_call
-             label="Stop Animating Me"
-             name="Stop Animating My Avatar">
-                 <menu_item_call.on_click
-                  function="Tools.StopAllAnimations" />
-            </menu_item_call>
-		</menu>
-        <menu
-         create_jump_keys="true"
-         label="My Status"
-         name="Status"
-         tear_off="true">
-            <menu_item_call
-             label="Away"
-             name="Set Away">
-                <menu_item_call.on_click
-                 function="World.SetAway" />
-            </menu_item_call>
-            <menu_item_call
-             label="Busy"
-             name="Set Busy">
-                <menu_item_call.on_click
-                 function="World.SetBusy"/>
-            </menu_item_call>
-        </menu>
         <menu_item_call
-         label="Request Admin Status"
-         name="Request Admin Options"
-         shortcut="control|alt|G"
-		 visible="false">
-            <menu_item_call.on_click
-             function="Advanced.RequestAdminStatus" />
+         label="Stop Animating Me"
+         name="Stop Animating My Avatar">
+          <menu_item_call.on_click
+           function="Tools.StopAllAnimations" />
         </menu_item_call>
+      </menu>
+
+      <menu
+       create_jump_keys="true"
+       label="Status"
+       name="Status"
+       tear_off="true">
         <menu_item_call
-         label="Leave Admin Status"
-         name="Leave Admin Options"
-         shortcut="control|alt|shift|G"
-		 visible="false">
+         label="Away"
+         name="Set Away">
+          <menu_item_call.on_click
+           function="World.SetAway" />
+        </menu_item_call>
+        <menu_item_call
+         label="Busy"
+         name="Set Busy">
+          <menu_item_call.on_click
+           function="World.SetBusy"/>
+        </menu_item_call>
+      </menu>
+
+      <menu_item_call
+       label="Request Admin Status"
+       name="Request Admin Options"
+       shortcut="control|alt|G"
+       visible="false">
+        <menu_item_call.on_click
+         function="Advanced.RequestAdminStatus" />
+      </menu_item_call>
+      <menu_item_call
+       label="Leave Admin Status"
+       name="Leave Admin Options"
+       shortcut="control|alt|shift|G"
+       visible="false">
+        <menu_item_call.on_click
+         function="Advanced.LeaveAdminStatus" />
+      </menu_item_call>
+
+      <menu_item_separator/>
+
+      <menu_item_call
+         label="Buy L$"
+         name="Buy and Sell L$">
+        <menu_item_call.on_click
+         function="BuyCurrency" />
+      </menu_item_call>
+
+      <menu_item_separator/>
+
+      <menu_item_call
+         label="Preferences..."
+         name="Preferences"
+         shortcut="control|P">
             <menu_item_call.on_click
-             function="Advanced.LeaveAdminStatus" />
+             function="Floater.Show"
+             parameter="preferences" />
         </menu_item_call>
+         <menu_item_call
+         label="Toolbars..."
+         name="Toolbars"
+         shortcut="control|T">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="toybox" />
+        </menu_item_call>
+         <menu_item_call
+         label="Hide all controls"
+         name="Hide UI"
+         shortcut="control|shift|U">
+           <menu_item_call.on_click
+            function="View.ToggleUI" />
+         </menu_item_call>
 
         <menu_item_separator/>
 
@@ -219,10 +228,10 @@
          use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="nearby_chat" />
+             parameter="chat_bar" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="nearby_chat" />
+             parameter="chat_bar" />
         </menu_item_check>
         <menu_item_call
          label="Nearby People"
@@ -249,7 +258,7 @@
      name="World"
      tear_off="true">
             <menu_item_check
-         label="Mini-Map"
+         label="Mini-map"
          name="Mini-Map"
          shortcut="control|shift|M">
             <menu_item_check.on_check
@@ -1136,14 +1145,6 @@
              function="ShowHelp"
              parameter="f1_help" />
         </menu_item_call>
-        <menu_item_check
-         label="Enable Hints"
-         name="Enable Hints">
-          <on_check
-            control="EnableUIHints"/>
-          <on_click
-            function="ToggleUIHints"/>
-        </menu_item_check>
 <!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
@@ -2435,7 +2436,7 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="raycast" />
         </menu_item_check>
-        <menu_item_check
+		<menu_item_check
          label="Render Complexity"
          name="rendercomplexity">
           <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 41a90f5984..f510b3c5ba 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4622,6 +4622,20 @@ Are you sure you want to quit?
      yestext="Quit"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmRestoreToybox"
+   type="alertmodal">
+    <unique/>
+Are you sure you want to restore your default buttons and toolbars? 
+    
+You cannot undo this action.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="DeleteItems"
@@ -7382,19 +7396,6 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
     </form>
   </notification>
 
-  <notification
- name="ModeChange"
- label=""
- type="alertmodal">
-    <unique/>
-    Changing modes requires you to quit and restart.
-    <tag>confirm</tag>
-    <usetemplate
-   name="okcancelbuttons"
-   yestext="Quit"
-   notext="Don't Quit"/>
-    </notification>
-
   <notification
  name="NoClassifieds"
  label=""
@@ -7549,6 +7550,20 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    notext="Don't Quit"/>
   </notification>
 
+  <notification
+    name="ConfirmHideUI"
+    label=""
+    type="alertmodal">
+    <unique/>
+    <tag>confirm</tag>
+    This action will hide all menu items and buttons. To get them back, click [SHORTCUT] again.
+    <usetemplate
+      name="okcancelignore"
+      yestext="OK"
+      notext="Cancel"
+      ignoretext="Confirm before hiding UI"/>
+  </notification>
+  
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index 20ff492c0f..2a24c74feb 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -10,7 +10,7 @@
  name="Mockup Tab"
  selection_enabled="true"
  tab_stop="false"
- title="Mockup Tab"
+ title="MOCKUP TAB"
  translate="false"
  width="0">
     <wearable_items_list
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
deleted file mode 100644
index ec5853649e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bg_alpha_color="DkGray"
- bg_opaque_color="DkGray"
- chrome="true"
- follows="left|bottom|right"
- focus_root="true"
- height="33"
- layout="topleft"
- left="0"
- name="bottom_tray"
- top="28"
- width="1310">
-  <string
-     name="DragIndicationImageName"
-     value="Accordion_ArrowOpened_Off" />
-  <string
-     name="SpeakBtnToolTip"
-     value="Turns microphone on/off" />
-  <string
-     name="VoiceControlBtnToolTip"
-     value="Shows/hides voice control panel" />
-  <layout_stack
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="28"
-   layout="topleft"
-   left="0"
-     mouse_opaque="false"
-     name="toolbar_stack"
-     orientation="horizontal"
-     top="0"
-     width="1310">
-    <layout_panel
-         auto_resize="false"
-         user_resize="false"
-         min_width="2"
-         width="2" />
-    <layout_panel
-         auto_resize="false"
-         layout="topleft"
-         max_width="320"
-         min_width="214"
-         height="28"
-         mouse_opaque="false"
-		 name="chat_bar_layout_panel"
-         user_resize="true"
-     width="250" >
-          <panel
-            name="chat_bar"
-            filename="panel_nearby_chat_bar.xml"
-            left="0"
-            height="28"
-        width="248"
-            top="0"
-            mouse_opaque="false"
-            follows="left|right"
-          />
-    </layout_panel>
-    <!--
-         This 5px Panel is an indicator of where the resize handle is.
-         The panel provides a gap between the resize handle icon and a button to the right.  
-        -->
-    <layout_panel
-     auto_resize="false"
-     layout="topleft"
-     max_width="5"
-     min_width="5"
-     name="chat_bar_resize_handle_panel"
-     user_resize="false"
-     width="5">
-      <icon
-       follows="top|right"
-       height="25"
-       image_name="ChatBarHandle"
-       layout="topleft"
-       left="-7"
-       name="resize_handle"
-       top="4"
-       width="5" />
-    </layout_panel>
-    <layout_panel
-        auto_resize="false"
-        follows="left|right"
-        height="28"
-        layout="topleft"
-        min_height="28"
-        min_width="59"
-        mouse_opaque="false"
-        name="speak_panel"
-        top_delta="0"
-        user_resize="false"
-        width="108">
-      <talk_button
-       follows="left|right"
-       height="23"
-       layout="topleft"
-       left="0"
-       name="talk"
-       top="5"
-       width="105">
-        <show_button
-         tab_stop="true">
-          <init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="voice_controls" />
-        </show_button>
-        <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
-                 & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
-        <speak_button
-         halign="center"
-         label="Speak"
-         label_selected="Speak"
-         name="speak_btn"
-         pad_right="20"
-         tab_stop="true"
-         use_ellipses="true" />
-      </talk_button>
-    </layout_panel>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="65"
-         mouse_opaque="false"
-         name="gesture_panel"
-         top_delta="0"
-         user_resize="false"
-         width="85">
-      <gesture_combo_list
-             follows="left|right"
-             height="23"
-             label="Gesture"
-             layout="topleft"
-             left="0"
-             name="Gesture"
-             tool_tip="Shows/hides gestures"
-             top="5"
-             width="82">
-        <combo_button
-                 pad_right="10"
-                 use_ellipses="true" />
-        <combo_list
-                 page_lines="17" />
-      </gesture_combo_list>
-    </layout_panel>
-    <layout_panel
-         auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="52"
-     mouse_opaque="false"
-     name="movement_panel"
-     user_resize="false"
-     width="83">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       label="Move"
-       layout="topleft"
-       name="movement_btn"
-       tool_tip="Shows/hides movement controls"
-       top="5"
-       use_ellipses="true"
-       width="80">
-        <init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="moveview" />
-      </bottomtray_button>
-
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="52"
-         mouse_opaque="false"
-         name="cam_panel"
-         user_resize="false"
-         width="83">
-      <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="View"
-             layout="topleft"
-             left="0"
-             name="camera_btn"
-             tool_tip="Shows/hides camera controls"
-             top="5"
-             use_ellipses="true"
-             width="80">
-        <init_callback
-                 function="Button.SetDockableFloaterToggle"
-                 parameter="camera" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-     min_width="40"
-		  mouse_opaque="false"
-     name="snapshot_panel"
-		  user_resize="false"
-     width="39">
-      <bottomtray_button
-			follows="left|right"
-			height="23"
-       image_overlay="Snapshot_Off"
-			image_pressed="PushButton_Press"
-			image_pressed_selected="PushButton_Selected_Press"
-			image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-			layout="topleft"
-			left="0"
-       name="snapshots"
-       tool_tip="Take snapshot"
-			top="5"
-       width="36">
-        <init_callback
-         function="Button.SetFloaterToggle"
-         parameter="snapshot" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-		  auto_resize="false"
-		  follows="left|right"
-		  height="28"
-		  layout="topleft"
-		  min_height="28"
-     min_width="52"
-		  mouse_opaque="false"
-     name="build_btn_panel"
-		  user_resize="false"
-     width="83">
-      <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
-Disabled for now.
--->
-      <bottomtray_button
-			follows="left|right"
-			height="23"
-			image_pressed="PushButton_Press"
-			image_pressed_selected="PushButton_Selected_Press"
-			image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       label="Build"
-			layout="topleft"
-			left="0"
-       name="build_btn"
-       tool_tip="Shows/hides Build Tools"
-			top="5"
-			use_ellipses="true"
-       width="80">
-        <commit_callback
-         function="Build.Toggle"
-         parameter="build" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-		  auto_resize="false"
-		  follows="left|right"
-		  height="28"
-		  layout="topleft"
-         min_height="28"
-     min_width="52"
-         mouse_opaque="false"
-     name="search_btn_panel"
-         user_resize="false"
-         width="83">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Search"
-             layout="topleft"
-             left="0"
-             name="search_btn"
-             tool_tip="Shows/hides Search"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="search" />
-            </bottomtray_button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="52"
-         mouse_opaque="false"
-         name="world_map_btn_panel"
-         user_resize="false"
-         width="83">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Map"
-             layout="topleft"
-             left="0"
-             name="world_map_btn"
-             tool_tip="Shows/hides World Map"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="world_map" />
-            </bottomtray_button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-     min_width="62"
-         mouse_opaque="false"
-         name="mini_map_btn_panel"
-         user_resize="false"
-         width="83">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Mini-Map"
-             layout="topleft"
-             left="0"
-             name="mini_map_btn"
-             tool_tip="Shows/hides Mini-Map"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="mini_map" />
-            </bottomtray_button>
-        </layout_panel>
-        <layout_panel
-         follows="left|right"
-         height="30"
-         layout="topleft"
-         min_width="95"
-         mouse_opaque="false"
-         name="chiclet_list_panel"
-         top="0"
-         user_resize="false"
-         width="189">
-<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
-as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
-      <chiclet_panel
-             chiclet_padding="4"
-             follows="left|right"
-             height="24"
-             layout="topleft"
-             left="1"
-             min_width="95"
-             mouse_opaque="false"
-             name="chiclet_list"
-             top="7"
-             width="189">
-        <button
-                 auto_resize="true"
-                 follows="right"
-                 height="29"
-                 image_hover_selected="SegmentedBtn_Left_Over"
-                 image_hover_unselected="SegmentedBtn_Left_Over"
-                 image_overlay="Arrow_Small_Left"
-                 image_pressed="SegmentedBtn_Left_Press"
-                 image_pressed_selected="SegmentedBtn_Left_Press"
-                 image_selected="SegmentedBtn_Left_Off"
-                 image_unselected="SegmentedBtn_Left_Off"
-                 layout="topleft"
-                 name="chicklet_left_scroll_button"
-                 tab_stop="false"
-                 top="-28"
-                 visible="false"
-                 width="7" />
-        <button
-                 auto_resize="true"
-                 follows="right"
-                 height="29"
-                 image_hover_selected="SegmentedBtn_Right_Over"
-                 image_hover_unselected="SegmentedBtn_Right_Over"
-                 image_overlay="Arrow_Small_Right"
-                 image_pressed="SegmentedBtn_Right_Press"
-                 image_pressed_selected="SegmentedBtn_Right_Press"
-                 image_selected="SegmentedBtn_Right_Off"
-                 image_unselected="SegmentedBtn_Right_Off"
-                 layout="topleft"
-                 name="chicklet_right_scroll_button"
-                 tab_stop="false"
-                 top="-28"
-                 visible="false"
-                 width="7" />
-      </chiclet_panel>
-    </layout_panel>
-    <layout_panel auto_resize="false"
-                      user_resize="false"
-                      width="4"
-                      min_width="4"/>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="im_well_panel"
-         top="0"
-         user_resize="false"
-         width="37">
-      <chiclet_im_well
-             follows="right"
-             height="28"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="im_well"
-             top="0"
-             width="35">
-        <!--
-Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
-xml attribute           Description
-image_unselected        "Unlit" - there are no new messages
-image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
-image_pressed           "Lit" - there are new messages
-image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
-             -->
-        <button
-                 auto_resize="true"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Unread_IM"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread IM messages"
-                 tool_tip="Conversations"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
-         name="notification_well_panel"
-         top="0"
-         user_resize="false"
-         width="37">
-      <chiclet_notification
-             follows="right"
-             height="23"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="notification_well"
-             top="5"
-             width="35">
-        <button
-                 auto_resize="true"
-                 bottom_pad="3"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Notices_Unread"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread"
-                 tool_tip="Notifications"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="notification_well_window" />
-        </button>
-      </chiclet_notification>
-    </layout_panel>
-    <layout_panel
-		   auto_resize="false"
-		   user_resize="false"
-		   min_width="4"
-		   name="DUMMY2"
-		   width="8" />
-  </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
new file mode 100644
index 0000000000..355a76e05f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="false"
+ chrome="true"
+ follows="left|top|right"
+ height="30"
+ layout="topleft"
+ mouse_opaque="false"
+ name="chiclet_bar"
+ width="1310">
+  <layout_stack
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="30"
+     layout="topleft"
+     left="0"
+     mouse_opaque="false"
+     name="toolbar_stack"
+     orientation="horizontal"
+     top="0"
+     width="1310">
+        <layout_panel
+         follows="left|right"
+         height="30"
+         layout="topleft"
+         min_width="95"
+         mouse_opaque="false"
+         name="chiclet_list_panel"
+         top="0"
+         user_resize="false"
+         width="189">
+      <chiclet_panel
+             chiclet_padding="4"
+             follows="left|right"
+             height="24"
+             layout="topleft"
+             left="1"
+             min_width="95"
+             mouse_opaque="false"
+             name="chiclet_list"
+             top="7"
+             width="189">
+        <button
+                 auto_resize="true"
+                 follows="right"
+                 height="29"
+                 image_hover_selected="SegmentedBtn_Left_Over"
+                 image_hover_unselected="SegmentedBtn_Left_Over"
+                 image_overlay="Arrow_Small_Left"
+                 image_pressed="SegmentedBtn_Left_Press"
+                 image_pressed_selected="SegmentedBtn_Left_Press"
+                 image_selected="SegmentedBtn_Left_Off"
+                 image_unselected="SegmentedBtn_Left_Off"
+                 layout="topleft"
+                 name="chicklet_left_scroll_button"
+                 tab_stop="false"
+                 top="-28"
+                 visible="false"
+                 width="7" />
+        <button
+                 auto_resize="true"
+                 follows="right"
+                 height="29"
+                 image_hover_selected="SegmentedBtn_Right_Over"
+                 image_hover_unselected="SegmentedBtn_Right_Over"
+                 image_overlay="Arrow_Small_Right"
+                 image_pressed="SegmentedBtn_Right_Press"
+                 image_pressed_selected="SegmentedBtn_Right_Press"
+                 image_selected="SegmentedBtn_Right_Off"
+                 image_unselected="SegmentedBtn_Right_Off"
+                 layout="topleft"
+                 name="chicklet_right_scroll_button"
+                 tab_stop="false"
+                 top="-28"
+                 visible="false"
+                 width="7" />
+      </chiclet_panel>
+    </layout_panel>
+    <layout_panel auto_resize="false"
+                      user_resize="false"
+                      width="4"
+                      min_width="4"/>
+    <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="37"
+         name="im_well_panel"
+         top="0"
+         user_resize="false"
+         width="37">
+      <chiclet_im_well
+             follows="right"
+             height="28"
+             layout="topleft"
+             left="0"
+             max_displayed_count="99"
+             name="im_well"
+             top="0"
+             width="35">
+        <!--
+Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
+xml attribute           Description
+image_unselected        "Unlit" - there are no new messages
+image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
+image_pressed           "Lit" - there are new messages
+image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
+             -->
+        <button
+                 auto_resize="true"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Unread_IM"
+                 image_overlay_alignment="center"
+                 image_pressed="WellButton_Lit"
+                 image_pressed_selected="WellButton_Lit_Selected"
+                 image_selected="PushButton_Press"
+                 label_color="Black"
+                 left="0"
+                 name="Unread IM messages"
+                 tool_tip="Conversations"
+                 width="34">
+          <init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="im_well_window" />
+        </button>
+      </chiclet_im_well>
+    </layout_panel>
+    <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="37"
+         name="notification_well_panel"
+         top="0"
+         user_resize="false"
+         width="37">
+      <chiclet_notification
+             follows="right"
+             height="23"
+             layout="topleft"
+             left="0"
+             max_displayed_count="99"
+             name="notification_well"
+             top="5"
+             width="35">
+        <button
+                 auto_resize="true"
+                 bottom_pad="3"
+                 follows="right"
+                 halign="center"
+                 height="23"
+                 image_overlay="Notices_Unread"
+                 image_overlay_alignment="center"
+                 image_pressed="WellButton_Lit"
+                 image_pressed_selected="WellButton_Lit_Selected"
+                 image_selected="PushButton_Press"
+                 label_color="Black"
+                 left="0"
+                 name="Unread"
+                 tool_tip="Notifications"
+                 width="34">
+          <init_callback
+                     function="Button.SetDockableFloaterToggle"
+                     parameter="notification_well_window" />
+        </button>
+      </chiclet_notification>
+    </layout_panel>
+  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 1c3e08d59b..3835cd17b6 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -120,33 +120,6 @@ label="Remember password"
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="10"
-  name="mode_selection_text"
-  top="20"
-  width="130">
-    Mode:
-  </text>
-  <combo_box
-    follows="left|bottom"
-  height="23"
-    max_chars="128"
-  tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-    top_pad="0"
-    name="mode_combo"
-    width="110">
-    <combo_box.item
-      label="Basic"
-      name="Basic"
-      value="settings_minimal.xml" />
-    <combo_box.item
-      label="Advanced"
-      name="Advanced"
-      value="" />
-  </combo_box>
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
   left_pad="8"
   name="start_location_text"
   top="20"
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index 84b5d11ba7..23e7814cad 100644
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
@@ -10,43 +10,10 @@
  name="panel_me"
  top="0"
  width="333">
-   <!--<text
-    type="string"
-    follows="top|left|right"
-    font="SansSerifHugeBold"
-    height="20"
-    layout="topleft"
-    left="15"
-    name="user_name"
-    text_color="white"
-    top="0"
-    mouse_opaque="true"
-    width="280">
-          (Loading...)
-   </text> -->
-    <tab_container
-     follows="all"
-     height="555"
-     halign="center"
-     layout="topleft"
-     left="5"
-     name="tabs"
-     tab_min_width="95"
-     tab_height="30"
-     tab_position="top"
-     top_pad="10"
-     width="317">
-      <panel
-         class="panel_my_profile"
-         filename="panel_my_profile.xml"
-         label="MY PROFILE"
-         help_topic="panel_my_profile_tab"
-         name="panel_profile" />
-      <panel
-         class="panel_picks"
-         filename="panel_picks.xml"
-         label="MY PICKS"
-         help_topic="panel_my_picks_tab"
-         name="panel_picks" />
-    </tab_container>
+    <panel
+        class="panel_picks"
+        filename="panel_picks.xml"
+        label="MY PICKS"
+        help_topic="panel_my_picks_tab"
+        name="panel_picks"/>
 </panel>
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 51ffec4727..7a8e872dc9 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -5,21 +5,21 @@
  bg_opaque_color="MouseGray"
  follows="left|top|right"
  focus_root="true" 
- height="60"
+ height="34"
  layout="topleft"
  name="navigation_bar"
  chrome="true"
- width="600">
+ width="800">
 	<icon
 	 follows="all"
 	 image_name="NavBar_BG"
 	 mouse_opaque="false"
 	 name="bg_icon"
 	 scale_image="true"
-	 visible="true"
+	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -30,7 +30,7 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
 	<icon
 	 follows="all"
@@ -41,16 +41,47 @@
 	 visible="false"
 	 left="0"
 	 top="0"
-	 height="60"
+	 height="34"
 	 width="600"/>
+  <icon
+    follows="all"
+    image_name="NavBar Separator"
+    mouse_opaque="false"
+    name="separator_image"
+    scale_image="true"
+    left="0"
+    top="0"
+    width="800"
+    height="2"/>
+	 <layout_stack
+       use_border="true"
+       bevel_style="none"
+       follows="all"
+       height="34"
+       layout="topleft"
+       left="0"
+       mouse_opaque="false"
+       name="nvp_stack"
+       orientation="horizontal"
+       top="0"
+       width="800">
+         <layout_panel
+           follows="top|left"
+           layout="topleft"
+           auto_resize="true"
+           user_resize="true"
+           min_width="480"
+           name="navigation_layout_panel"
+           width="480">
 	<panel
 	 background_visible="false"
 	 follows="left|top|right"
 	 top="3"
 	 height="23"
 	 layout="topleft"
+               left="0"
 	 name="navigation_panel"
-	 width="600">
+     width="480">
 	     <pull_button
 	     follows="left|top"
 	     direction="down"
@@ -87,7 +118,7 @@
 	     top_delta="0"
 	     width="32" />
 	    <location_input
-	     follows="left|right|top"
+                   follows="all"
 	     halign="right"
 	     height="23"
 	     label="Location"
@@ -97,70 +128,50 @@
 	     mouse_opaque="false"
 	     name="location_combo"
 	     top_delta="0"
-	     width="226">
+            width="355">
          <combo_list
          mouse_wheel_opaque="true"/>
-	     <!-- *TODO: Delete.  Let the location_input use the correct art sizes.
-	        <location_input.add_landmark_button
-	         height="18"
-	         name="location_combo_add"
-	         width="20" />
-	        <location_input.info_button
-	         height="18"
-	         name="location_combo_info"
-	         width="20" />
-	      -->
 	    </location_input>
-	<!--     <button -->
-	<!--      follows="right|top" -->
-	<!--      height="20" -->
-	<!--      image_disabled="TextField_Search_Off" -->
-	<!--      image_disabled_selected="TextField_Search_Off" -->
-	<!--      image_hover_selected="TextField_Search_Off" -->
-	<!--      image_hover_unselected="TextField_Search_Off" -->
-	<!--      image_selected="TextField_Search_Off" -->
-	<!--      image_unselected="TextField_Search_Off" -->
-	<!--      layout="topleft" -->
-	<!--      left_pad="5" -->
-	<!--      mouse_opaque="false" -->
-	<!--      name="search_bg" -->
-	<!--      top_delta="0" -->
-	<!--      width="168" /> -->
-        <search_combo_box
-	     follows="right|top"
-	     halign="right"
-	     height="23"
-	     label="Search"
+             </panel>
+         </layout_panel>
+         
+         <layout_panel
+           auto_resize="false"
+           layout="topleft"
+           max_width="5"
+           min_width="5"
+           name="nav_bar_resize_handle_panel"
+           user_resize="false"
+           width="5">
+             <icon
+               follows="top|right"
+               height="25"
+               image_name="ChatBarHandle"
+               layout="topleft"
+               left="-6"
+               name="resize_handle"
+               top="4"
+               width="5" />
+         </layout_panel>
+         
+         <layout_panel
+           follows="top|left"
 	     layout="topleft"
-	     right="-10"
-	     mouse_opaque="false"
-	     name="search_combo_box"
-	     tool_tip="Search"
-	     top_delta="0"
-	     width="244" >
-         <combo_editor
-          label="Search [SECOND_LIFE]"
-          name="search_combo_editor"/>
-         <combo_list
-          draw_border="true"
-          border.highlight_light_color="FocusColor"
-          border.highlight_dark_color="FocusColor"
-          border.shadow_light_color="FocusColor"
-          border.shadow_dark_color="FocusColor"
-          mouse_wheel_opaque="true" />
-        </search_combo_box>
-	</panel>
+           auto_resize="true"
+           user_resize="true"
+           min_width="315"
+           name="favorites_layout_panel"
+           width="315">
     <favorites_bar
      follows="left|right|top"
      font="SansSerifSmall"
-     height="15"
+               height="20"
      layout="topleft"
      left="0"
      name="favorite"
      image_drag_indication="Accordion_ArrowOpened_Off"
-     bottom="55"
      tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="590">
+               width="311">
         <label
          follows="left|top"
          height="15"
@@ -173,14 +184,20 @@
          width="102">
           Favorites Bar
         </label>
-    <chevron_button name=">>"
-                     image_unselected="TabIcon_Close_Off"
-                     image_selected="TabIcon_Close_Off"
-                     tab_stop="false"
-                     follows="left|bottom"
-                     tool_tip="Show more of My Favorites"
-                     width="15"
-		     top="15"
-                     height="15"/>
+                 <!-- More button actually is a text box. -->
+                 <more_button
+                   follows="left|bottom"
+                   name=">>"
+                   tab_stop="false"
+                   tool_tip="Show more of My Favorites"
+                   top="13"
+                   width="50"
+                   bottom="0"
+                   valign="bottom">
+                   More &#9660;
+                   </more_button>
   </favorites_bar>
+         </layout_panel>
+     
+     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
new file mode 100644
index 0000000000..f766236b2e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel
+ height="300"
+ follows="all"
+ 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 (powered by Google)"
+             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" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 7daa52b2d9..24046d5cca 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -117,7 +117,7 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="35"
+     height="23"
      layout="topleft"
      top_pad="5"
      left="8"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 87e263726d..85f402dfa2 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -4,12 +4,12 @@ bg_opaque_color="DkGray2"
        background_visible="true"
        background_opaque="true"
  follows="all"
- height="548"
+ height="571"
  label="Picks"
  layout="topleft"
- left="0"
+ left="8"
  name="panel_picks"
- top="0"
+ top_pad="0"
  width="313">
  <string
   name="no_picks"
@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
  <accordion
   fit_parent="true" 
   follows="all"
-  height="485"
+  height="514"
   layout="topleft"
   left="0"
   name="accordion"
@@ -81,10 +81,10 @@ bg_opaque_color="DkGray2"
        left="1"
        height="27"
        label="bottom_panel"
-       layout="bottom"
+       layout="topleft"
        name="edit_panel"
-       top_pad="-2"
-       width="313">
+       top_pad="0"
+       width="312">
          
          <layout_stack
 		  follows="bottom|left|right"
@@ -149,8 +149,9 @@ bg_opaque_color="DkGray2"
          follows="bottom|left|right"
          layout="topleft"
          left="0"
-         height="40"
+         height="30"
          name="buttons_cucks"
+         top_pad="0"
          width="313">
       
       <layout_stack
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index cb547d7c6b..d9067b41c7 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -86,16 +86,6 @@
    name="appearance_camera_movement"
    tool_tip="Use automatic camera positioning while in edit mode"
    width="242" />
-  <check_box
-   control_name="SidebarCameraMovement"
-   follows="left|top"
-   height="16"
-   initial_value="true"
-   label="Sidebar"
-   layout="topleft"
-   name="appearance_sidebar_positioning"
-   tool_tip="Use automatic camera positioning for sidebar"
-   width="242" />
   <icon
 	 follows="left|top"
 	 height="18"
@@ -117,7 +107,7 @@
    name="keyboard_lbl"
    width="270"
    top_delta="2">
-   Keyboard:
+    Keyboard:
   </text>
   <check_box
    control_name="ArrowKeysAlwaysMove"
@@ -149,7 +139,7 @@
    name="mouse_lbl"
    width="270"
    top_pad="15">
-   Mouse:
+    Mouse:
   </text>
   <check_box
    control_name="FirstPersonAvatarVisible"
@@ -205,7 +195,7 @@
    name="single_click_action_lbl"
    width="150"
    top_pad="20">
-   Single click on land:
+    Single click on land:
   </text>
   <combo_box
    height="23"
@@ -235,7 +225,7 @@
    name="double_click_action_lbl"
    width="150"
    top_pad="12">
-   Double click on land:
+    Double click on land:
   </text>
   <combo_box
    height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
deleted file mode 100644
index 0f330a7b98..0000000000
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray
-  name="sidebar"
-  background_visible="false"
-  mouse_opaque="true"
-  width="333"
-  collapsed="true"
->
-  <!-- Individual tabs must show background to have seemless
-	appearance up to tray panel header word like "Home".
-	Embedded panels are inset by a pixel and so their
-	backgrounds will not block the world fully. -->
-
-  <sidetray_tab
-    name="sidebar_openclose"
-    help_topic="sidebar_openclose"
-    tab_title="Toggle Sidebar"
-    description="Toggle Sidebar."
-    image="TabIcon_Open_Off"
-	image_selected="TabIcon_Close_Off"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-    <panel /> <!-- dummy panel, never to actually be seen -->
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_home"
-    help_topic="sidebar_home"
-    tab_title="Home"
-    description="Home."
-    image="TabIcon_Home_Off"
-    image_selected="TabIcon_Home_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="panel_sidetray_home"
-        name="panel_home"
-        filename="panel_sidetray_home_tab.xml"
-        label="home"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_me"
-    help_topic="sidebar_me"
-    tab_title="My Profile"
-    description="Edit your public profile and Picks."
-    image="TabIcon_Me_Off"
-    image_selected="TabIcon_Me_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-    <panel_container
-      name="panel_container"
-      default_panel_name="panel_me"
-      width="333"
-    >
-      <panel
-        class="panel_me"
-        name="panel_me"
-        filename="panel_me.xml"
-        label="Me"
-      />
-
-    </panel_container>
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_people"
-    help_topic="sidebar_people"
-    tab_title="People"
-    description="Find your friends, contacts and people nearby."
-    image="TabIcon_People_Off"
-    image_selected="TabIcon_People_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-    <panel_container
-      name="panel_container"
-      default_panel_name="panel_people"
-      width="333"
-    >
-      <panel
-        class="panel_people"
-        name="panel_people"
-        filename="panel_people.xml"
-      />
-      <panel
-        class="panel_profile_view"
-        name="panel_profile_view"
-        filename="panel_profile_view.xml"
-      />
-      <panel
-        class="panel_group_info_sidetray"
-        name="panel_group_info_sidetray"
-        filename="panel_group_info_sidetray.xml"
-        label="Group Profile"
-        font="SansSerifBold"
-      />
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"
-      />
-
-    </panel_container>
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_places"
-    help_topic="sidebar_places"
-    tab_title="Places"
-    label="Places"
-    description="Find places to go and places you&apos;ve visited before."
-    image="TabIcon_Places_Off"
-	image_selected="TabIcon_Places_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="panel_places"
-        name="panel_places"
-        filename="panel_places.xml"
-        label="Places"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_inventory"
-    help_topic="sidebar_inventory"
-    tab_title="My Inventory"
-    description="Browse your inventory."
-    image="TabIcon_Things_Off"
-    image_selected="TabIcon_Things_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <badge location="top_left" location_percent_vcenter="50" location_percent_hcenter="95" />
-      <panel
-        class="sidepanel_inventory"
-        name="sidepanel_inventory"
-        filename="sidepanel_inventory.xml"
-        label="Edit Inventory"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
-  <sidetray_tab
-    name="sidebar_appearance"
-    help_topic="sidebar_appearance"
-    tab_title="My Appearance"
-    description="Change your appearance and current look."
-    image="TabIcon_Appearance_Off"
-    image_selected="TabIcon_Appearance_Selected"
-    mouse_opaque="false"
-    background_visible="true"
-  >
-      <panel
-        class="sidepanel_appearance"
-        name="sidepanel_appearance"
-        filename="sidepanel_appearance.xml"
-        label="Edit Appearance"
-        font="SansSerifBold"
-      />
-  </sidetray_tab>
-
-</side_tray>
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 5894abd03b..422bbada7f 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,8 +35,8 @@
     </panel.string>
   <panel
     height="18"
-    left="-355"
-    width="95"
+    left="-370"
+    width="160"
     top="1"
     follows="right|top" 
     name="balance_bg" 
@@ -60,11 +60,11 @@
      halign="center"
      font="SansSerifSmall"
      follows="right|top|bottom"
-     image_hover_unselected="buy_over"
-     image_unselected="buy_off"
-     image_pressed="buy_press"
+     image_hover_unselected="PushButton_Over"
+     image_unselected="PushButton_Off"
+     image_pressed="PushButton_Press"
      height="18"
-     label="BUY L$"
+     label="Buy L$"
      label_color="White"
      left_pad="0"
      label_shadow="true"
@@ -74,39 +74,41 @@
      tool_tip="Click to buy more L$"
      top="0"
      width="55" />
+    <button
+     halign="left"
+     font="SansSerifSmall"
+     follows="right|top|bottom"
+     imgoverlay_label_space="7"
+     image_overlay="Command_MiniCart_Icon"
+     image_overlay_alignment="left"
+     image_hover_unselected="PushButton_Over"
+     image_unselected="PushButton_Off"
+     image_pressed="PushButton_Press"
+     height="18"
+     label="Shop"
+     label_color="White"
+     left_pad="0"
+     label_shadow="true"
+     name="goShop"
+     pad_right="0"
+     pad_bottom="2"
+     tool_tip="Open Second Life Marketplace"
+     top="0"
+     width="65" />
   </panel>
-  <combo_box
-    follows="right|top"   
-    drop_down_button.pad_left="10" 
-    left_pad="5"
-    top="0"
-    width="120"
-    height="20"
-    name="mode_combo"
-    tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-    >
-    <combo_box.item
-      label="Basic Mode"
-      name="Basic"
-      value="settings_minimal.xml" />
-    <combo_box.item
-      label="Advanced Mode"
-      name="Advanced"
-      value="" />
-  </combo_box>
     <text
-      left_pad="5"
      type="string"
      font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|top"
-     halign="center"
+     halign="right"
      height="16"
      top="5"
      layout="topleft"
+     left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="75">
+     width="145">
         24:00 AM PST
     </text>
     <button
@@ -117,7 +119,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="10"
+     left_pad="15"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 42f64c3a76..b9e714dd30 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -10,6 +10,7 @@
 -->
 
 <floater
+ open_positioning="none"
  legacy_header_height="0"
  header_height="0"
  name="toast"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
new file mode 100644
index 0000000000..3c69a0cb6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbar_view
+ follows="all"
+ layout="topleft"
+ name="toolbar view"
+ height="500"
+ width="1024"
+ left="0"
+ top="0" 
+ mouse_opaque="false"
+ tab_stop="false"
+ visible="true">
+  <layout_stack name="bottom_toolbar_stack"
+                orientation="vertical"
+                left="0"
+                top="0"
+                width="1024"
+                height="500"
+                follows="all"
+                mouse_opaque="false">
+  <layout_panel name="vertical_toolbar_panel"
+                auto_resize="true"
+                user_resize="false"
+                width="1024"
+                height="500"
+                mouse_opaque="false">
+    <layout_stack name="vertical_toolbar_stack"
+                  orientation="horizontal"
+                  left="0"
+                  top="0"
+                  width="1024"
+                  height="500"
+                  follows="all"
+                  mouse_opaque="false">
+      <layout_panel name="left_toolbar_panel"
+                    auto_resize="false"
+                    user_resize="false"
+                    height="500"
+                    width="30"
+                    mouse_opaque="false">
+        <toolbar follows="left|top|bottom"
+                 button_panel.bg_opaque_image="Rounded_Rect_Right"
+                 name="toolbar_left"
+                 width="30"
+                 left="0"
+                 top="10"
+                 bottom="-10"
+                 side="left"
+                 button_display_mode="icons_only">
+	             <icon layout="topleft"
+	                   height="15"
+	                   width="28"
+	                   follows="left|top"
+	                   top="20"
+	                   left="10"
+	                   tab_stop="false" 
+                       visible="false"
+	                   image_name="Caret_Left_Icon"
+                       name="caret" />
+        </toolbar>
+      </layout_panel>
+      <layout_panel name="non_toolbar_panel"
+                    auto_resize="true"
+                    user_resize="false"
+                    mouse_opaque="false"
+                    height="100"
+                    width="200">
+        <view top="0"
+              follows="all"
+              height="100"
+              left="0"
+              mouse_opaque="false"
+              name="floater_snap_region"
+              width="200"/>
+        <view top="0"
+              follows="left|top|bottom"
+              height="100"
+              left="0"
+              mouse_opaque="false"
+              name="minimized_floaters_region"
+              width="160"/>
+        <panel follows="left|top|right"
+               layout="topleft"
+               height="30"
+               left_pad="10"
+               mouse_opaque="false"
+               name="chiclet_container"
+               tab_stop="false"
+               top="0"
+               bg_visible="false"
+               width="20">
+        </panel>          
+        <panel bottom="100"
+               follows="left|right|bottom"
+               height="25"
+               left="0"
+               mouse_opaque="false"
+               tab_stop="false"
+               name="stand_stop_flying_container"
+               visible="false"
+               width="200"/>
+      </layout_panel>
+      <layout_panel name="right_toolbar_panel"
+                    auto_resize="false"
+                    user_resize="false"
+                    height="500"
+                    width="30"
+                    mouse_opaque="false">
+        <toolbar
+          button_panel.bg_opaque_image="Rounded_Rect_Left"
+          follows="right|top|bottom"
+          name="toolbar_right"
+          width="30"
+          left="0"
+          top="10"
+          bottom="-10"
+          side="right"
+          button_display_mode="icons_only">
+	      <icon layout="topleft"
+	            height="15"
+	            width="28"
+	            follows="left|top"
+	            top="20"
+	            left="10"
+	            tab_stop="false" 
+                visible="false"
+	            image_name="Caret_Right_Icon"
+	            name="caret" />
+        </toolbar>
+      </layout_panel>
+    </layout_stack>
+  </layout_panel>
+  <layout_panel name="bottom_toolbar_panel"
+                auto_resize="false"
+                user_resize="false"
+                height="30"
+                width="1024"
+                mouse_opaque="false">
+    <toolbar layout="topleft"
+             button_panel.bg_opaque_image="Rounded_Rect_Top"
+             name="toolbar_bottom"
+             height="30"
+             left="40"
+             right="-40"
+             top="0"
+             side="bottom"
+             follows="left|right|bottom"
+             button_display_mode="icons_with_text"
+             visible="true">
+             <icon layout="topleft"
+	            height="28"
+	            width="15"
+	            follows="left|top"
+	            top="20"
+	            left="10"
+	            tab_stop="false" 
+                visible="false"
+                use_draw_context_alpha="false"
+	            image_name="Caret_Bottom_Icon"
+	            name="caret" />
+    </toolbar>
+  </layout_panel>
+  </layout_stack>
+</toolbar_view>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 7a176ff367..b52784d6bc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -67,6 +67,8 @@
 										top="0"
 										orientation="vertical"
 										name="inbox_outbox_layout_stack"
+                    open_time_constant="0.02"
+                    close_time_constant="0.02"
 										height="235"
 										width="330">
 								 <layout_panel
@@ -91,10 +93,10 @@
                       label=""
                       height="200"
                       width="330">
-                     <string name="InboxLabelWithArg">Received Items ([NUM])</string>
-                     <string name="InboxLabelNoArg">Received Items</string>
+                     <string name="InboxLabelWithArg">Received items ([NUM])</string>
+                     <string name="InboxLabelNoArg">Received items</string>
                      <button
-                        label="Received Items"
+                        label="Received items"
 												font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
@@ -122,7 +124,7 @@
                         halign="right"
                         top_pad="0"
                         width="300">
-                        [NUM] New
+                        [NUM] new
                      </text>
                      <panel
                         follows="all"
@@ -173,10 +175,10 @@
                       label=""
                       height="200"
                       width="330">
-                     <string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string>
-                     <string name="OutboxLabelNoArg">Merchant Outbox</string>
+                     <string name="OutboxLabelWithArg">Merchant outbox ([NUM])</string>
+                     <string name="OutboxLabelNoArg">Merchant outbox</string>
                      <button
-                        label="Merchant Outbox"
+                        label="Merchant outbox"
                         font="SansSerifMedium"
                         name="outbox_btn"
                         height="35"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a41330c9f6..78e10d207c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -16,16 +16,16 @@
 	<string name="StartupDetectingHardware">Detecting hardware...</string>
 	<string name="StartupLoading">Loading [APP_NAME]...</string>
 	<string name="StartupClearingCache">Clearing cache...</string>
-	<string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
+	<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
 	<string name="StartupInitializingVFS">Initializing VFS...</string>
-  <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string>
+  <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string>
 
 	<!--  progress -->
 	<string name="ProgressRestoring">Restoring...</string>
-	<string name="ProgressChangingResolution">Changing Resolution...</string>
+	<string name="ProgressChangingResolution">Changing resolution...</string>
 
 	<!-- Legacy strings, almost never used -->
-	<string name="Fullbright">Fullbright (Legacy)</string>	<!-- used in the Build > materials dropdown-->
+	<string name="Fullbright">Fullbright (legacy)</string>	<!-- used in the Build > materials dropdown-->
 
 	<!-- Login -->
 	<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
@@ -38,8 +38,8 @@
   <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
   <string name="LoginInitializingFonts">Loading fonts...</string>
   <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
-	<string name="LoginProcessingResponse">Processing Response...</string>
-	<string name="LoginInitializingWorld">Initializing World...</string>
+	<string name="LoginProcessingResponse">Processing response...</string>
+	<string name="LoginInitializingWorld">Initializing world...</string>
 	<string name="LoginDecodingImages">Decoding images...</string>
 	<string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
 	<string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
@@ -56,7 +56,7 @@
         <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain.  Please contact your Grid administrator.</string>
         <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrator.</string>
 
-	<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+	<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/</string>
@@ -2051,6 +2051,8 @@ Returns a string with the requested data about the region
 	<string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
+	<string name="Open landmarks">Open landmarks</string>
+
 	<!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
@@ -3650,8 +3652,60 @@ Try enclosing path to the editor with double quotes.
   <string name="BeaconSound">Viewing sound beacons (yellow)</string>
   <string name="BeaconMedia">Viewing media beacons (white)</string>
   <string name="ParticleHiding">Hiding Particles</string>
-  
-  <!-- Mesh UI terms -->
+
+  <!-- commands -->
+
+  <string name="Command_AboutLand_Label">About land</string>
+  <string name="Command_Appearance_Label">Appearance</string>
+  <string name="Command_Avatar_Label">Avatar</string>
+  <string name="Command_Build_Label">Build</string>
+  <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Compass_Label">Compass</string>
+  <string name="Command_Destinations_Label">Destinations</string>
+  <string name="Command_Gestures_Label">Gestures</string>
+  <string name="Command_HowTo_Label">How to</string>
+  <string name="Command_Inventory_Label">Inventory</string>
+  <string name="Command_Map_Label">Map</string>
+  <string name="Command_Marketplace_Label">Marketplace</string>
+  <string name="Command_MiniMap_Label">Mini-map</string>
+  <string name="Command_Move_Label">Move</string>
+  <string name="Command_People_Label">People</string>
+  <string name="Command_Picks_Label">Picks</string>
+  <string name="Command_Places_Label">Places</string>
+  <string name="Command_Preferences_Label">Preferences</string>
+  <string name="Command_Profile_Label">Profile</string>
+  <string name="Command_Search_Label">Search</string>
+  <string name="Command_Snapshot_Label">Snapshot</string>
+  <string name="Command_Speak_Label">Speak</string>
+  <string name="Command_View_Label">View</string>
+  <string name="Command_Voice_Label">Nearby voice</string>
+
+  <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
+  <string name="Command_Appearance_Tooltip">Change your avatar</string>
+  <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
+  <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
+  <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
+  <string name="Command_Compass_Tooltip">Compass</string>
+  <string name="Command_Destinations_Tooltip">Destinations of interest</string>
+  <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
+  <string name="Command_HowTo_Tooltip">How to do common tasks</string>
+  <string name="Command_Inventory_Tooltip">View and use your belongings</string>
+  <string name="Command_Map_Tooltip">Map of the world</string>
+  <string name="Command_Marketplace_Tooltip">Go shopping</string>
+  <string name="Command_MiniMap_Tooltip">Show nearby people</string>
+  <string name="Command_Move_Tooltip">Moving your avatar</string>
+  <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
+  <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
+  <string name="Command_Places_Tooltip">Places you've saved</string>
+  <string name="Command_Preferences_Tooltip">Preferences</string>
+  <string name="Command_Profile_Tooltip">Edit or view your profile</string>
+  <string name="Command_Search_Tooltip">Find places, events, people</string>
+  <string name="Command_Snapshot_Tooltip">Take a picture</string>
+  <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+  <string name="Command_View_Tooltip">Changing camera angle</string>
+  <string name="Command_Voice_Tooltip">People nearby with voice capability</string>
+
+ <!-- Mesh UI terms -->
   <string name="Retain%">Retain%</string>
   <string name="Detail">Detail</string>
   <string name="Better Detail">Better Detail</string>
@@ -3660,5 +3714,4 @@ Try enclosing path to the editor with double quotes.
   <string name="Wrap">Wrap</string>
   <string name="Preview">Preview</string>
   <string name="Normal">Normal</string>
-
   </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 61d36468d7..e2baba92a3 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -15,7 +15,6 @@
         label_color_selected="ButtonLabelSelectedColor"
         label_color_disabled="ButtonLabelDisabledColor"
         label_color_disabled_selected="ButtonLabelSelectedDisabledColor"
-        highlight_color="ButtonUnselectedFgColor"
         image_color="ButtonImageColor"
         image_color_disabled="ButtonImageColor"
         flash_color="ButtonFlashBgColor"
@@ -27,5 +26,9 @@
         scale_image="true"
         handle_right_mouse="true"
         use_draw_context_alpha="true"
-        held_down_delay.seconds="0.5">
+        held_down_delay.seconds="0.5"
+        button_flash_count="8"
+        button_flash_rate="1.25"
+        display_pressed_state="true"
+        >
 </button>
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 2e5ebafe46..adbb183317 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <!-- See also settings.xml UIFloater* settings for configuration -->
-<floater 
+<floater
  name="floater"
+ open_positioning="none"
+ layout="topleft"
  bg_opaque_color="FloaterFocusBackgroundColor"
  bg_alpha_color="FloaterDefaultBackgroundColor"
  bg_opaque_image="Window_Foreground" 
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
new file mode 100644
index 0000000000..7e7a9c61cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbar pad_left="1"
+         pad_right="1"
+         pad_top="1"
+         pad_bottom="1"
+         pad_between="1"
+         min_girth="24"
+         mouse_opaque="false"
+         read_only="false">
+  <button_panel name="button_panel"
+                bg_opaque_image="Rounded_Rect"
+                background_visible="true"
+                bg_opaque_image_overlay="MouseGray"
+                background_opaque="true"/>
+  <button_icon_and_text imgoverlay_label_space="7"
+                        label_color_selected="White"
+                        halign="left"
+                        image_pressed="PushButton_Press"
+                        image_pressed_selected="PushButton_Selected_Press"
+                        image_selected="PushButton_Selected_Press"
+                        image_disabled_selected="PushButton_Selected_Disabled"
+                        image_disabled="PushButton_Disabled"
+                        button_width.min="70"
+                        button_width.max="140"
+                        desired_height="24"
+                        pad_left="10" 
+                        pad_right="10"
+                        follows="left|top"
+                        chrome="true"
+                        image_overlay_alignment="left"
+                        use_ellipses="true"
+                        auto_resize="true"
+                        flash_color="EmphasisColor"/>
+  <button_icon pad_left="10"
+               pad_right="10"
+               image_bottom_pad="10"
+               image_top_pad="10"
+               image_pressed="PushButton_Press"
+               image_pressed_selected="PushButton_Selected_Press"
+               image_selected="PushButton_Selected_Press"
+               image_disabled_selected="PushButton_Selected_Disabled"
+               image_disabled="PushButton_Disabled"
+               desired_height="38"
+               button_width.min="38"
+               button_width.max="38"               
+               follows="left|top"
+               label=""
+               halign="left"
+               chrome="true"
+               use_ellipses="true"
+               auto_resize="true"
+               flash_color="EmphasisColor"/>
+</toolbar>
-- 
cgit v1.2.3