Pull from richard/viewer-experience-fui

16 files changed, 255 insertions, 774 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 20d0fa1c91..afe8584a2d 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  open_positioning="specified"
- specified_left="683"
- specified_bottom="0"
+ specified_left="320"
+ specified_bottom="80"
  legacy_header_height="18"
  can_minimize="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
index 9229741801..989b4a0580 100644
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  open_positioning="specified"
- specified_left="150"
- specified_bottom="0"
+ specified_left="320"
+ specified_bottom="10"
  height="60"
  layout="topleft"
  legacy_header_height="25"
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_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index cbbd68beb3..b7370580af 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  open_positioning="specified"
- specified_left="535"
- specified_bottom="0"
+ specified_left="558"
+ specified_bottom="80"
  legacy_header_height="18"
  can_dock="false"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_my_profile.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
index 713515d041..2d307028e4 100644
--- a/indra/newview/skins/default/xui/en/floater_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_picks.xml
@@ -3,14 +3,14 @@
  open_positioning="cascading"
  can_close="true"
  can_resize="true"
- height="570"
+ height="572"
  help_topic="sidebar_me"
  min_width="333"
  min_height="440"
- name="floater_profile"
+ name="floater_picks"
  save_rect="true"
  save_visibility="true"
- title="MY PROFILE"
+ title="Picks"
  width="333" >
    <panel
     class="panel_me"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 896532e26b..dd818e2e06 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -7,8 +7,8 @@
   layout="topleft"
   min_height="400"
   min_width="500"
-  name="floater_web_content"
-  help_topic="search"
+  name="floater_search"
+  help_topic="floater_search"
   save_rect="true"
   save_visibility="true"
   title=""
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/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 4d3d431b3a..b4be17e677 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -8,13 +8,6 @@
  tab_stop="false" 
  name="main_view"
  width="1024">
-  <view top="0"
-      follows="all"
-      height="768"
-      left="0"
-      mouse_opaque="false"
-      name="world_view_rect"
-      width="1024"/>
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
@@ -57,6 +50,13 @@
                   tab_stop="false" 
                   name="world_panel"
                   width="1024">
+      <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"
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 2737746c0e..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_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_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_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_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 5475fcd245..3c69a0cb6c 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -64,14 +64,32 @@
                     user_resize="false"
                     mouse_opaque="false"
                     height="100"
-                    width="100">
+                    width="200">
         <view top="0"
               follows="all"
               height="100"
               left="0"
               mouse_opaque="false"
               name="floater_snap_region"
-              width="100"/>
+              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"
@@ -80,7 +98,7 @@
                tab_stop="false"
                name="stand_stop_flying_container"
                visible="false"
-               width="100"/>
+               width="200"/>
       </layout_panel>
       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 04fc5c868c..78e10d207c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3683,7 +3683,7 @@ Try enclosing path to the editor with double quotes.
   <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 them</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>