Merge with SVN viewer-2.0.0-3 branch

26 files changed, 636 insertions, 489 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 824df082d8..4463d44049 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -35,14 +35,14 @@
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -331,14 +331,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -586,14 +586,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -814,14 +814,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1002,14 +1002,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1223,14 +1223,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1444,14 +1444,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1665,14 +1665,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1886,14 +1886,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2119,14 +2119,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2340,14 +2340,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2561,14 +2561,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2782,14 +2782,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3003,14 +3003,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3305,14 +3305,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 37c6cbf391..e94ca1b30b 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -25,6 +25,8 @@
         Fetched
     </floater.string>
     <filter_editor
+     search_button_visible="false"
+     text_pad_left="12"
      follows="left|top|right"
      height="16"
      label="Type here to search"
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 467168ebd8..10bcee7c85 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
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="294"
      mouse_opaque="true"
      name="IconLocked"
      top="5"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
@@ -410,7 +410,7 @@
      width="330">
         Mark Item:
     </text-->
-    
+
 
     <!--radio_group
      draw_border="false"
@@ -438,7 +438,7 @@
          top_delta="0"
          width="70" />
     </radio_group-->
-    
+
     <!--text
      type="string"
      length="1"
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 a767b40b03..3e2045e1f7 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="340"
      mouse_opaque="true"
      name="lock"
      top="1"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
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 cb3ff92363..ef68478460 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -26,14 +26,14 @@
      width="497" />
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="444"
      mouse_opaque="true"
      name="lock"
      top="3"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
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 d76ea398d5..76b2e5c811 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater 
- background_opaque="false"
- background_visible="true" 
  bevel_style="in"
- bg_alpha_color="0.0 0.0 0.0 0.0"
  left="0"
  top="0" 
  follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b53f4fb99c..e373da300c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -283,6 +283,7 @@
      label_selected="Options"
      layout="topleft"
      name="Options..."
+     tool_tip="Set the Grid Options"
      width="26"
      height="22" />
     <button
@@ -959,15 +960,15 @@
             mouse_opaque="true"
             name="sale type"
             intial_value="2">
-        <combo_item
+        <combo_box.item
            name="Copy"
            label="Copy"
            value="2" />
-        <combo_item
+        <combo_box.item
            name="Contents"
            label="Contents"
            value="3" />
-        <combo_item
+        <combo_box.item
            name="Original"
            label="Original"
            value="1" />
@@ -2685,16 +2686,17 @@
          layout="topleft"
          left_delta="0"
          name="checkbox show owners"
-         tool_tip="Color parcels by owner"
+         tool_tip="Colorize the parcels according to the type of owner"
          top_pad="8"
          width="205" />
-            <button
-     image_overlay="Arrow_Right_Off"
-     picture_style="true"
+        <button
+         image_overlay="Arrow_Right_Off"
+         picture_style="true"
          left_pad="5"
          name="button show owners help"
-     width="26"
-     height="22" />
+         tool_tip="See an explanation of colors"
+         width="26"
+         height="22" />
         <text
          type="string"
          length="1"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9ad9a87f95..9306f83dde 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1504,6 +1504,17 @@
         </menu_item_check>
         <menu_item_separator
          layout="topleft" />
+         <menu_item_check
+        label="Avatar Rendering Cost"
+        layout="topleft"
+        name="Avatar Rendering Cost">
+           <menu_item_check.on_check
+            function="Advanced.CheckInfoDisplay"
+            parameter="shame" />
+           <menu_item_check.on_click
+            function="Advanced.ToggleInfoDisplay"
+            parameter="shame" />
+       </menu_item_check>
         <menu
          create_jump_keys="true"
          label="Rendering Types"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8b20918700..7ede45a080 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6495,10 +6495,10 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block
 
   <notification
    icon="notifytip.tga"
-   name="UnableToOpenCommandURL"
+   name="UnsupportedCommandSLURL"
    priority="high"
    type="notifytip">
-    The link you clicked cannot be opened from this web browser.
+    The SLurl you clicked on is not supported.
   </notification>
 
   <notification name="IMToast" type="notifytoast">
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 3de3365539..f211ae0ad6 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -1,65 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	name="avatar_list_item"
-	title="avatar_list_item"
-  visible="true"
-	width="314"
-	height="30"
-  left="0"
-  top="100"
-  follows="bottom|right|left"
-  min_width="150" 
-  max_height="30" 
-  
-  background_opaque="false"
-  background_visible="true"
-  bevel_style="in"
-  bg_alpha_color="0.3 0.3 0.3 1.0">
-  
-  <avatar_icon
-    bottom="5" left="5" width="20" height="20" follows="top|left"
-    color="1 1 1 1" enabled="true" image_name="smile.png"
-    mouse_opaque="true" name="avatar_icon"
-  />
-  
-  <text
-    bottom="4" left="35" width="160" height="20" follows="right|left"
-    font="SansSerifBigBold" text_color="white"
-    mouse_opaque="true" name="user_name" >
-    Boris Linden
-  </text>  
-  
-  <text
-    bottom="3" left="190" width="40" height="20" follows="right"
-    font="SansSerif" text_color="0.5 0.5 0.5 1.0"
-    mouse_opaque="true" name="user_status" >
-    Away
-  </text>
-
-  <icon
-    bottom="5" left="230" width="20" height="20" follows="right"
-    color="1 1 1 1" enabled="true" image_name="speaking_indicator.tga"
-    mouse_opaque="true" name="locator"
-  />
-  
-  <button
-    bottom="5" left="260" width="20" height="20" follows="right"
-    name="info_btn" label=""
-    image_unselected="avatar_info_btn.tga" image_disabled="avatar_info_btn.tga"
-    image_selected="avatar_info_btn_active.tga" image_hover_selected="avatar_info_btn_active.tga"
-    image_disabled_selected="avatar_info_btn.tga" font="SansSerifBigBold"
-  />
-  
-  <button
-    bottom="5" left="290" width="20" height="20" follows="right"
-    name="profile_btn" label=""
-    image_unselected="profile_chevron_btn.tga" image_disabled="profile_chevron_btn.tga"
-    image_selected="profile_chevron_btn_active.tga" image_hover_selected="profile_chevron_btn_active.tga"
-    image_disabled_selected="profile_chevron_btn.tga" font="SansSerifBigBold"
-  />
-
-
-
-</panel> 
+ follows="top|right|left"
+ height="24"
+ layout="topleft"
+ left="0"
+ name="avatar_list_item"
+ top="0"
+ width="320">
+    <icon
+     follows="top|right|left" 
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="320" />
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="320" />
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     image_name="smile.png"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     width="20" />
+    <text
+     follows="left|right"
+     font="SansSerifBigBold"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     name="avatar_name"
+     text_color="white"
+     top="4"
+     use_ellipses="true" 
+     value="Unknown"
+     width="180" />
+    <text
+     follows="right"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="avatar_status"
+     text_color="0.5 0.5 0.5 1"
+     value="Away"
+     width="50" />
+    <output_monitor
+     auto_update="true"
+     follows="right"
+     draw_border="false"
+     halign="left"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     mouse_opaque="true"
+     name="speaking_indicator"
+     top="4"
+     visible="true"
+     width="20" />
+    <button
+     follows="right"
+     font="SansSerifBigBold"
+     height="18"
+     image_disabled="Info"
+     image_disabled_selected="Info"
+     image_hover_selected="Info"
+     image_selected="Info"
+     image_unselected="Info"
+     layout="topleft"
+     left_pad="2"
+     name="info_btn"
+     picture_style="true"
+     top="2"
+     width="18" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index df91920721..6449059ef0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ mouse_opaque="false"
  background_visible="true"
  bg_alpha_color="0.25 0.25 0.25 1"
  bg_opaque_color="0.25 0.25 0.25 1"
@@ -12,6 +13,7 @@
  border_visible="true"
  width="1000">
     <layout_stack
+     mouse_opaque="false"    
      border_size="0"
      clip="false" 
      follows="left|right|bottom|top"
@@ -33,6 +35,7 @@
          top="0"
          width="5"/>
         <layout_panel
+ 		 mouse_opaque="false"        
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -57,6 +60,7 @@
          top="0"
          width="3"/>
         <layout_panel
+         mouse_opaque="false"        
          auto_resize="false"
          follows="right"
          height="28"
@@ -96,6 +100,7 @@
          top="0"
          width="8"/>
         <layout_panel
+         mouse_opaque="false"        
          auto_resize="false"
          follows="right"
          height="28"
@@ -188,6 +193,7 @@
          top="0"
          width="5"/>
         <layout_panel
+         mouse_opaque="false"
          follows="left|right"
          height="28"
          layout="topleft"
@@ -197,6 +203,7 @@
          width="150"
          user_resize="false">
             <chiclet_panel
+	         mouse_opaque="false"
              follows="left|right"
              height="25"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 6ba4d13117..311caa4866 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -16,28 +16,28 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-    
-    <button 
-     layout="topleft" 
-     name="back" 
-     right="-9" 
-     top="0" 
-     width="25" 
-     height="25" 
+
+    <button
+     layout="topleft"
+     name="back"
+     right="-9"
+     top="0"
+     width="25"
+     height="25"
      label=""
      follows="top|left"
      image_overlay="BackArrow_Off"
      tab_stop="false" />
-    <text 
-     layout="topleft" 
-     top="0" 
-     left="10" 
-     width="250" 
-     height="20" 
-     font="SansSerifHugeBold" 
-     text_color="white" 
+    <text
+     layout="topleft"
+     top="0"
+     left="10"
+     width="250"
+     height="20"
+     font="SansSerifHugeBold"
+     text_color="white"
      follows="top|left|right"
-     mouse_opaque="true" 
+     mouse_opaque="true"
      name="group_name">(Loading...)</text>
     <texture_picker
      follows="left|top"
@@ -81,15 +81,15 @@
      left="5"
      width="65" />
     <button
-	 top="632"
-	 left="75"	 
-	 height="20"
-     font="SansSerifSmall"
-     label="Refresh"
-     label_selected="Refresh"
+     follows="top|left"
+     height="20"
+     image_overlay="Refresh_Off"
+     layout="topleft"
      name="btn_refresh"
-	 follows="top|left"
-     width="65" />
+     picture_style="true"
+     top="632"
+     left="75"
+     width="20" />
     <button
      top="632"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 9ae165cbb9..7b8bd8b337 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -185,7 +185,7 @@
 Select multiple Members by holding the Ctrl key and
 clicking on their names.
             </panel.string>
-         <search_editor
+         <filter_editor
          layout="topleft"
          top="10"
          left="4"
@@ -193,17 +193,9 @@ clicking on their names.
          height="20"
          follows="left|top|right"
          max_length="250"
-         label="Filter People"
+         label="Filter Members"
          name="filter_input"
-         font="SansSerif"
-         background_image="TextField_Search_Off"
-         text_pad_left="10"
-         text_color="black">
-           <search_button label=""
-           top_pad="4"
-           left_pad="6" 
-               />
-         </search_editor>
+         font="SansSerif" />
             <!--<line_editor
              border_style="line"
              border_thickness="1"
@@ -318,7 +310,7 @@ including the Everyone and Owner Roles.
              name="power_partial_icon">
                 checkbox_enabled_false.tga
             </panel.string>
-            <search_editor
+            <filter_editor
             layout="topleft"
             top="10"
             left="4"
@@ -328,15 +320,7 @@ including the Everyone and Owner Roles.
             max_length="250"
             label="Filter Roles"
             name="filter_input"
-            font="SansSerif"
-            background_image="TextField_Search_Off"
-            text_pad_left="10"
-            text_color="black">
-                 <search_button label=""
-                 top_pad="4"
-                 left_pad="6" 
-                    />
-            </search_editor>
+            font="SansSerif" />
             <!--<line_editor
              border_style="line"
              border_thickness="1"
@@ -426,7 +410,7 @@ including the Everyone and Owner Roles.
                 Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
             </panel.string>
-            <search_editor
+            <filter_editor
             layout="topleft"
             top="10"
             left="4"
@@ -436,15 +420,7 @@ things in this group. There&apos;s a broad variety of Abilities.
             max_length="250"
             label="Filter Abilities"
             name="filter_input"
-            font="SansSerif"
-            background_image="TextField_Search_Off"
-            text_pad_left="10"
-            text_color="black">
-                 <search_button label=""
-                 top_pad="4"
-                 left_pad="6" 
-                  />
-            </search_editor>
+            font="SansSerif" />
             <!--<line_editor
              border_style="line"
              border_thickness="1"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e5a417e3d0..310e3908ca 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
+background_visible="true"
+color="DkGray"
  follows="all"
- height="400"
+ height="570"
  label="People"
  layout="topleft"
  min_height="350"
- min_width="240"
  name="people_panel"
- width="305">
+ top="0"
+ left="0"
+ bevel_style="none"
+ width="333">
     <string
      name="no_people"
      value="No people" />
@@ -31,103 +34,95 @@
      name="groups_filter_label"
      value="Filter Groups" />
     <filter_editor
-     background_image="TextField_Search_Off"
      follows="left|top|right"
      font="SansSerif"
      height="23"
      layout="topleft"
      left="15"
-     max_length="270"
+     max_length="300"
      name="filter_input"
      text_color="black"
-     text_pad_left="26"
      top="3"
-     width="256" />
-    <button
-     follows="left|top|right"
-     height="13"
-     image_selected="Search"
-     image_unselected="Search"
-     layout="topleft"
-     left="20"
-     name="people_search"
-     picture_style="true"
-     scale_image="false"
-     top="8"
-     width="13" />
+     width="300" />
     <tab_container
-     follows="left|top|right|bottom"
-     height="326"
+     follows="all"
+     height="488"
      layout="topleft"
-     left="9"
+     left="10"
      name="tabs"
+     bevel_style="in"
      tab_position="top"
      top_pad="15"
-     width="285">
+     width="313">
         <panel
-         bevel_style="none"
-         follows="left|top|right|bottom"
-         height="390"
+          follows="all"
+         height="488"
          label="Nearby"
          layout="topleft"
+         left="0"
          name="nearby_panel"
-         width="285">
+         top="0"
+         width="313">
             <avatar_list
-             follows="left|top|right|bottom"
-             height="357"
+             follows="all"
+             height="430"
              layout="topleft"
              left="0"
              name="avatar_list"
-             top="2"
+             top="0"
              volume_column_width="20"
-             width="285" />
+             width="313" />
             <panel
              background_visible="true"
              bevel_style="none"
-             bottom="390"
+            top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
              layout="topleft"
              left="0"
              name="bottom_panel"
-             width="285">
-                <button
-                 follows="bottom|left"
-                 font="SansSerifBigBold"
-                 height="18"
-                 image_selected="OptionsMenu_Press"
-                 image_unselected="OptionsMenu_Off"
-                 layout="topleft"
-                 left="20"
-                 name="nearby_view_sort_btn"
-                 picture_style="true"
-                 tool_tip="Change sort and view of Residents list"
-                 top="7"
-                 width="18" />
+             width="313">
+             <button
+             follows="bottom|left"
+             font="SansSerifBigBold"
+             tool_tip="Change sort and view of Residents list"
+             height="18"
+             image_disabled="OptionsMenu_Disabled"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             left="10"
+             name="nearby_view_sort_btn"
+             picture_style="true"
+             top="5"
+             width="18" />
             </panel>
         </panel>
         <panel
          background_visible="true"
          bevel_style="none"
-         follows="left|top|right|bottom"
-         height="390"
+         follows="all"
+             color="DkGray2"
+         height="460"
+         left="0"
+         top="0"
          label="Friends"
          layout="topleft"
          name="friends_panel"
-         width="285">
+         width="313">
             <accordion
-             follows="left|top|right|bottom"
-             height="357"
+             follows="all"
+             height="430"
              layout="topleft"
              left="0"
              name="friends_accordion"
              top="2"
-             width="285">
+             width="313">
                 <accordion_tab
                  can_resize="false"
                  layout="topleft"
-                 min_height="100"
+                 min_height="150"
                  name="tab_online"
                  title="Online">
                         <avatar_list
@@ -138,29 +133,29 @@
                          left="0"
                          name="avatars_online"
                          top="0"
-                         width="285" />
+                         width="313" />
                 </accordion_tab>
                 <accordion_tab
                  can_resize="false"
                  layout="topleft"
-                 min_height="100"
+                 height="230"
                  name="tab_all"
                  title="All">
                         <avatar_list
                          draw_heading="false"
                          follows="all"
-                         height="255"
+                         height="230"
                          layout="topleft"
                          left="0"
                          name="avatars_all"
                          top="0"
-                         width="285" />
+                         width="313" />
                 </accordion_tab>
             </accordion>
             <panel
              background_visible="true"
              bevel_style="none"
-             bottom="390"
+             top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
@@ -168,25 +163,27 @@
              left="0"
              name="bottom_panel"
              width="285">
-                <button
-                 follows="bottom|left"
-                 font="SansSerifBigBold"
-                 height="18"
-                 image_selected="OptionsMenu_Press"
-                 image_unselected="OptionsMenu_Off"
-                 layout="topleft"
-                 left="20"
-                 name="friends_viewsort_btn"
-                 picture_style="true"
-                 tool_tip="Change sort and view of Friends list"
-                 top="7"
-                 width="18" />
+               <button
+               follows="bottom|left"
+               font="SansSerifBigBold"
+               tool_tip="Change sort and view of Friends list"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               name="friends_viewsort_btn"
+               picture_style="true"
+               top="5"
+               width="18" />
                 <button
                  follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="add_btn"
@@ -200,6 +197,7 @@
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
                  layout="topleft"
                  left_pad="180"
                  name="del_btn"
@@ -215,13 +213,16 @@
          follows="left|top|right|bottom"
          height="390"
          label="Groups"
+         top="0"
          layout="topleft"
          name="groups_panel"
          width="285">
             <group_list
+             draw_heading="false"
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
+             color="DkGray2"
              left="0"
              name="group_list"
              top="2"
@@ -229,7 +230,7 @@
             <panel
              background_visible="true"
              bevel_style="none"
-             bottom="390"
+             top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
@@ -237,26 +238,28 @@
              left="0"
              name="bottom_panel"
              width="285">
-                <button
-                 enabled="false"
-                 follows="bottom|left"
-                 font="SansSerifBigBold"
-                 height="18"
-                 image_selected="OptionsMenu_Press"
-                 image_unselected="OptionsMenu_Off"
-                 layout="topleft"
-                 left="20"
-                 name="gear_btn"
-                 picture_style="true"
-                 tool_tip="Change sort and view of Groups list"
-                 top="7"
-                 width="18" />
+               <button
+               enabled="false"
+               follows="bottom|left"
+               font="SansSerifBigBold"
+               tool_tip="Change sort and view of Groups list"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               name="gear_btn"
+               picture_style="true"
+               top="5"
+               width="18" />
                 <button
                  follows="bottom|left"
                  font="SansSerifBigBold"
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="plus_btn"
@@ -296,13 +299,15 @@
         <panel
          background_visible="true"
          bevel_style="none"
+         top="0"
          follows="left|top|right|bottom"
          height="390"
          label="Recent"
          layout="topleft"
          name="recent_panel"
          width="285">
-            <avatar_list
+            <avatar_list_tmp
+             color="DkGray2"
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
@@ -313,7 +318,7 @@
             <panel
              background_visible="true"
              bevel_style="none"
-             bottom="390"
+             top_pad="0"
              follows="left|right|bottom"
              height="30"
              label="bottom_panel"
@@ -321,19 +326,20 @@
              left="0"
              name="bottom_panel"
              width="285">
-                <button
-                 follows="bottom|left"
-                 font="SansSerifBigBold"
-                 height="18"
-                 image_selected="OptionsMenu_Press"
-                 image_unselected="OptionsMenu_Off"
-                 layout="topleft"
-                 left="20"
-                 name="recent_viewsort_btn"
-                 picture_style="true"
-                 tool_tip="Change sort and view of Residents list"
-                 top="7"
-                 width="18" />
+               <button
+               follows="bottom|left"
+               font="SansSerifBigBold"
+               tool_tip="Change sort and view of Recent Residents list"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               name="recent_viewsort_btn"
+               picture_style="true"
+               top="5"
+               width="18" />
             </panel>
         </panel>
     </tab_container>
@@ -346,7 +352,7 @@
      left="10"
      name="button_bar"
      orientation="horizontal"
-     width="295">
+     width="313">
         <layout_panel
          default_tab_group="1"
          follows="left|top|right"
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 c330116702..9edd14ce49 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -2,111 +2,100 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="420"
+ height="570"
  layout="topleft"
  left="0"
  name="panel_pick_info"
  top="0"
- width="255">
+ width="333">
+    <button
+     follows="top|left"
+     height="25"
+     width="25"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     picture_style="true"
+     left="10"
+     top="7" />
     <text
-     follows="top"
+     follows="top|left"
      font="SansSerifHugeBold"
-     height="15"
+     height="22"
      layout="topleft"
-     left="10"
+     left_pad="15"
      name="title"
      text_color="white"
-     top="5"
      value="Pick Info"
-     width="150" />
-    <button
-     follows="top|right"
-     height="20"
-     image_overlay="BackArrow_Off"
-     layout="topleft"
-     name="back_btn"
-     picture_style="true"
-     right="-20"
-     top="7"
-     width="20" />
+     width="270" />
     <scroll_container
      color="DkGray2"
-     follows="left|top|right|bottom"
-     height="300"
+     opaque="true"
+     follows="left|top|bottom"
+     height="490"
      layout="topleft"
-     left="0"
+     left="10"
+     top_pad="10"
      name="profile_scroll"
      reserve_scroll_corner="true"
-     opaque="true"
-     width="255">
+     width="313">
     <panel
      name="scroll_content_panel"
-     follows="left|top|right"
+     follows="left|top|right|bottom"
+     min_height="300"
      layout="topleft"
      top="0"
+     background_visible="false"
+     height="488"
      left="0"
-     width="240"
-     height="575">
-    <panel
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     follows="left|right|top|bottom"
-     height="550"
-     layout="topleft"
-     left="0"
-     min_height="300"
-     top="0"
-     width="220">
+     width="311">
         <texture_picker
          enabled="false"
-         follows="left|top|right"
-         height="190"
+         follows="left|top"
+         height="197"
          layout="topleft"
          left="10"
          name="pick_snapshot"
          top="20"
-         width="220" />
+         width="290" />
         <text
          follows="left|top|right"
          height="20"
+         width="291"
          layout="topleft"
-         font="SansSerif"
+         font="SansSerifBig"
          font.style="BOLD"
          left="10"
+         top_pad="10"
          name="pick_name"
          text_color="white"
          value="[name]"
          word_wrap="true" />
         <text
          follows="left|top"
-         height="30"
+         height="25"
          layout="topleft"
          left="10"
          name="pick_location"
-         text_color="white"
-         top_pad="10"
-         width="255"
+         width="291"
          word_wrap="true"
          value="[loading...]" />
         <text
          follows="left|top|right"
-         height="150"
+         height="400"
          layout="topleft"
          left="10"
-         top_pad="20"
          name="pick_desc"
-         text_color="white"
-         width="225"
+         width="290"
          value="[description]"
          word_wrap="true" />
-    </panel> 
     </panel>
     </scroll_container>
     <panel
      follows="left|right|bottom"
      height="30"
      layout="topleft"
-     top_pad="2"
+     top_pad="5"
      left="10"
      name="buttons">
         <button
@@ -125,7 +114,7 @@
          height="25"
          label="Teleport"
          layout="topleft"
-         left_pad="3"
+         left_pad="5"
          name="teleport_btn"
          top="0"
          width="80" />
@@ -135,7 +124,7 @@
          height="25"
          label="Map"
          layout="topleft"
-         left_pad="3"
+         left_pad="5"
          name="show_on_map_btn"
          top="0"
          width="80" />
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 4c8c4efbe7..37e873b6a8 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -7,27 +7,27 @@
  left="0"
  name="picture_item"
  top="0"
- width="275">
+ width="305">
     <icon
-     height="120" 
+     height="120"
      image_name="ListItem_Over"
-     left="0" 
+     left="0"
      mouse_opaque="false"
-     name="hovered_icon" 
+     name="hovered_icon"
      top="0"
-     scale_image="true" 
+     scale_image="true"
      visible="false"
-     width="270"/>
+     width="305"/>
     <icon
-     height="120" 
+     height="120"
      image_name="ListItem_Select"
-     left="0" 
+     left="0"
      mouse_opaque="false"
      name="selected_icon"
      top="0"
      scale_image="true"
      visible="false"
-     width="270"/>
+     width="305"/>
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
@@ -40,6 +40,7 @@
      name="picture"
      tab_stop="false"
      top="5"
+     top_pad="5"
      width="120" />
     <text
      follows="top|left|right"
@@ -50,7 +51,7 @@
      text_color="white"
      top="5"
      use_ellipses="true"
-     width="120"
+     width="130"
      word_wrap="true" />
     <text
      follows="top|left|right"
@@ -70,8 +71,8 @@
      layout="topleft"
      name="info_chevron"
      picture_style="true"
-     right="262"
+     right="290"
      tab_stop="false"
-     top="3"
+     top="5"
      width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index c56bb32feb..bceaedcdb4 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,40 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="left|top|right|bottom"
- height="420"
+ height="515"
  label="Picks"
  layout="topleft"
  left="0"
  name="panel_picks"
  top="0"
- width="285">
-    <layout_stack
-     name="layout"
-     orientation="vertical"
-     follows="all"
-     layout="topleft"
-     left="0"
-     top="0"
-     height="420"
-     width="284"
-     border_size="0">
+ width="313">
         <scroll_container
          color="DkGray2"
          follows="left|top|right|bottom"
-         height="350"
+         height="495"
          layout="topleft"
-         left="2"
+         left="0"
          name="profile_scroll"
          opaque="true"
          top="0"
-         width="284">
+         width="313">
             <list
-             height="115"
+             height="120"
              layout="topleft"
              left="0"
              name="picks_list"
              top="0"
-             width="284" />
+             width="305" />
         </scroll_container>
         <panel
          background_visible="true"
@@ -42,12 +32,13 @@
          enabled="false"
          auto_resize="false"
          follows="bottom"
-         height="30"
+         left="0"
+         height="23"
          label="bottom_panel"
          layout="topleft"
          name="edit_panel"
-         top_pad="5"
-         width="284">
+         top_pad="0"
+         width="313">
             <button
              enabled="false"
              follows="bottom|left"
@@ -55,6 +46,7 @@
              height="18"
              image_selected="OptionsMenu_Press"
              image_unselected="OptionsMenu_Off"
+              image_disabled="OptionsMenu_Disabled"
              layout="topleft"
              left="10"
              name="gear_menu_btn"
@@ -65,8 +57,7 @@
              follows="bottom|left"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="AddItem_Off"
-             image_disabled_selected="AddItem_Press"
+             image_disabled="AddItem_Disabled"
              image_selected="AddItem_Press"
              image_unselected="AddItem_Off"
              layout="topleft"
@@ -80,8 +71,7 @@
              follows="bottom|right"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="TrashItem_Off"
-             image_disabled_selected="TrashItem_Press"
+             image_disabled="TrashItem_Disabled"
              image_selected="TrashItem_Press"
              image_unselected="TrashItem_Off"
              layout="topleft"
@@ -93,11 +83,11 @@
         </panel>
         <panel
          follows="bottom"
-         height="30"
          auto_resize="false"
          layout="topleft"
+         height="30"
          name="buttons_cucks"
-         width="284">
+         width="313">
             <button
              enabled="false"
              follows="bottom|left"
@@ -108,5 +98,4 @@
              name="show_on_map_btn"
              width="85" />
         </panel>
-    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index bff28718a7..b379ad2276 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -16,7 +16,6 @@
      name="teleport_history_tab_title"
      value="Teleport History" />
     <filter_editor
-     background_image="TextField_Search_Off"
      follows="left|top|right"
      font="SansSerif"
      height="23"
@@ -24,22 +23,8 @@
      layout="topleft"
      left="15"
      name="Filter"
-     text_color="black"
-     text_pad_left="26"
      top="3"
      width="256" />
-    <button
-     follows="left|top|right"
-     height="13"
-     image_selected="Search"
-     image_unselected="Search"
-     layout="topleft"
-     left="20"
-     name="landmark_search"
-     picture_style="true"
-     scale_image="false"
-     top="8"
-     width="13" />
     <tab_container
      follows="all"
      height="326"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 41de34fbed..2a800f809b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- bevel_style="out"
- follows="left|top|right|bottom"
- height="420"
+ follows="all"
+ height="515"
  label="Profile"
  layout="topleft"
  left="0"
  name="panel_profile"
  top="0"
- width="255">
+ width="313">
     <string
      name="CaptionTextAcctInfo">
         [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
@@ -21,30 +20,27 @@
      name="my_account_link_url"
      value="http://secondlife.com/account" />
     <string
-     name="partner_edit_link_url">
-        http://www.secondlife.com/account/partners.php?lang=en
-    </string>
-    <string
      name="no_partner_text"
      value="None" />
     <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="300"
+     height="515"
+     min_height="300"
      layout="topleft"
-     left="0"
      name="profile_scroll"
      reserve_scroll_corner="true"
      opaque="true"
-     width="255">
+     top="0"
+     width="313">
 	 <panel
             name="scroll_content_panel"
 	    follows="left|top|right"
 	    layout="topleft"
 	    top="0"
 	    left="0"
-	    width="240"
-	    height="780">
+	    width="284"
+	    height="700">
 	 <panel
 	    follows="left|top"
 	    height="117"
@@ -52,7 +48,7 @@
 	    left="10"
 	    name="second_life_image_panel"
 	    top="10"
-	    width="260">
+	    width="280">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -75,13 +71,13 @@
              text_color="white"
              top_delta="0"
              value="[SECOND_LIFE]:"
-             width="130" />
+             width="170" />
             <text
              follows="left|top|right"
-             height="70"
+             height="90"
              layout="topleft"
              name="sl_description_edit"
-             width="130"
+             width="170"
              word_wrap="true">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </text>
@@ -93,7 +89,7 @@
 	 top_pad="10"
          left="10"
          name="first_life_image_panel"
-         width="260">
+         width="280">
             <texture_picker
              allow_no_texture="true"
              default_image_name="None"
@@ -115,13 +111,13 @@
              text_color="white"
              top_delta="0"
              value="Real World:"
-             width="130" />
+             width="175" />
             <text
              follows="left|top|right"
-             height="70"
+             height="90"
              layout="topleft"
              name="fl_description_edit"
-             width="130"
+             width="180"
              word_wrap="true">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
             </text>
@@ -137,18 +133,17 @@
          name="me_homepage_text"
          text_color="white"
          top_pad="10"
-         width="255">
+         width="280">
              Homepage:
         </text>
         <text
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="homepage_edit"
-         top_pad="5"
          value="http://librarianavengers.org"
-         width="225"
+         width="280"
          word_wrap="false" />
         <text
          follows="left|top"
@@ -161,16 +156,16 @@
          text_color="white"
          top_pad="20"
          value="Member Since:"
-         width="255" />
+         width="280" />
         <text
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="register_date"
          top_pad="5"
          value="05/31/1976"
-         width="160"
+         width="280"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -183,7 +178,7 @@
          text_color="white"
          top_pad="15"
          value="Account Status:"
-         width="100" />
+         width="280" />
        <!-- <text
          type="string"
          follows="left|top"
@@ -196,14 +191,14 @@
 	 value="Go to Dashboard"
          width="100"/> -->
         <text
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="acc_status_text"
          top_pad="5"
          value="Resident. No payment info on file."
-         width="255"
+         width="280"
          word_wrap="true" />
         <text
          follows="left|top"
@@ -216,33 +211,24 @@
          text_color="white"
          top_pad="15"
          value="Partner:"
-         width="100" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left_pad="10"
-         name="partner_edit_link"
-         top_delta="0"
-         value="[[URL] Edit]"
-         width="100" />
+         width="280" />
         <panel
-         follows="left|top|right"
+         follows="left|top"
          height="15"
          layout="topleft"
          left="10"
          name="partner_data_panel"
          top_pad="5"
-         width="255">
+         width="280">
             <text
-             follows="left|top|right"
+             follows="left|top"
              height="15"
              layout="topleft"
              left="0"
              name="partner_text"
              top="0"
              value="[FIRST] [LAST]"
-             width="240"
+         width="280"
              word_wrap="true" />
          </panel>
         <text
@@ -256,28 +242,28 @@
          text_color="white"
          top_pad="15"
          value="Groups:"
-         width="255" />
+         width="280" />
         <text
-         follows="left|top|right|bottom"
+         follows="left|top|bottom"
          height="160"
          layout="topleft"
          left="10"
          name="sl_groups"
          top_pad="5"
-         width="130"
+         width="280"
          word_wrap="true">
             Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
         </text>
       </panel>
       </scroll_container>
+
    <panel
      follows="bottom|left"
-     height="30"
      layout="topleft"
-     left="10"
+     left="0"
      name="profile_buttons_panel"
-     top_pad="5"
-     width="280">
+     top_pad="0"
+     width="313">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -322,13 +308,13 @@
          width="75" />
     </panel>
     <panel
-     height="30"
+     follows="bottom|left"
      layout="topleft"
-     left="10"
+     left="0"
      name="profile_me_buttons_panel"
-     top_pad="5"
+     top_pad="0"
      visible="false"
-     width="280">
+     width="313">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index e166675364..200c67b321 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -3,14 +3,14 @@
   name="sidebar"
   background_visible="false"
   mouse_opaque="true"
-  width="305"
+  width="333"
   collapsed="true"
 >
   <sidetray_tab
     name="sidebar_home"
     tab_title="Home"
     description="Home."
-    image="icn_voice-groupfocus.tga"
+    image="BackArrow_Off"
     mouse_opaque="false"
     background_opaque="false"
     background_visible="true"
@@ -50,17 +50,17 @@
         border="true"
         font="SansSerifBold"
       />
-      <panel 
-        class="panel_group_info_sidetray" 
-        name="panel_group_info_sidetray" 
-        filename="panel_group_info_sidetray.xml" 
-        label="Group Info" 
+      <panel
+        class="panel_group_info_sidetray"
+        name="panel_group_info_sidetray"
+        filename="panel_group_info_sidetray.xml"
+        label="Group Info"
         border="true"
       />
-      <panel 
+      <panel
         class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray" 
-        filename="panel_block_list_sidetray.xml" 
+        name="panel_block_list_sidetray"
+        filename="panel_block_list_sidetray.xml"
         label="Blocked Residents &amp; Objects"
         border="true"
       />
@@ -87,7 +87,7 @@
 
   <sidetray_tab
     name="sidebar_me"
-    tab_title="My Profile"
+    tab_title="Me"
     description="Change your profile, your look and quick links to your outfits."
     image="TabIcon_Me_Off"
     mouse_opaque="false"
@@ -97,7 +97,7 @@
         class="panel_me_profile_view"
         name="panel_me_profile"
         filename="panel_me_profile.xml"
-        label="My Profile"
+        label="Me"
         border="true"
         font="SansSerifBold"
       />
@@ -108,16 +108,15 @@
     tab_title="Appearance"
     description="Change your looks and appearance."
     image="TabIcon_Appearance_Off"
-    mouse_opaque="false" 
-    background_opaque="false" 
-    background_visible="true" 
-    bg_opaque_color="0.5 0.5 0.5 1.0"
+    mouse_opaque="false"
+    background_opaque="false"
+    background_visible="true"
   >
-      <panel 
+      <panel
         class="panel_appearance"
-        name="panel_appearance" 
-        filename="panel_appearance.xml" 
-        border="true" 
+        name="panel_appearance"
+        filename="panel_appearance.xml"
+        border="true"
       />
   </sidetray_tab>
 
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 82d6945e0f..70198dc626 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,12 +1,162 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Teleport History" bottom="0" height="326" left="0" width="380"
-     border="true" follows="left|top|right|bottom">
-	<scroll_list bottom="0" column_padding="0" draw_heading="false"
-	     draw_stripes="false" follows="left|top|bottom|right" left="0"
-	     multi_select="false" name="history_items" search_column="1"
-	     sort_column="1" height="326" width="380" >
+     border="true" follows="left|top|right|bottom">     
+    <accordion
+     follows="left|top|right|bottom"
+     height="326"
+     layout="topleft"
+     left="0"
+     top="0"
+     name="history_accordion"
+     width="380">
+
+	<accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="today"
+         title="Today">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="today_items"
+             top="0"
+             width="285">
 		<column name="landmark_icon" width="20" />
 		<column dynamic_width="true" label="Region" name="region" />
 		<column name="index" width="0" />
-	</scroll_list>
+	    </scroll_list>
+	</accordion_tab>     
+
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="yesterday"
+         title="Yesterday">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="yesterday_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="3_days_ago"
+         title="3 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="3_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="4_days_ago"
+         title="4 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="4_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="5_days_ago"
+         title="5 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="5_days_ago_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="6_days_ago"
+         title="6 days ago">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="6_days_ago"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+        <accordion_tab
+         can_resize="false"
+         layout="topleft"
+         min_height="100"
+         name="older_than_6_days"
+         title="Older than 6 days">
+            <scroll_list
+             draw_heading="false"
+             follows="all"
+             height="150"
+             layout="topleft"
+             left="0"
+             name="older_than_6_days_items"
+             top="0"
+             width="285">
+		<column name="landmark_icon" width="20" />
+		<column dynamic_width="true" label="Region" name="region" />
+		<column name="index" width="0" />
+	    </scroll_list>
+	</accordion_tab>     
+     
+    </accordion>
+          
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 441caffa28..01fd84e09d 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -11,8 +11,6 @@
   left="100"
   top="500"
   follows="right|bottom" 
-  background_opaque="true"
-  background_visible="true"
   bevel_style="in"
   can_minimize="false"
   can_tear_off="false"
@@ -20,7 +18,7 @@
   can_drag_on_left="false"
   can_close="false"
   can_dock="false"  
-  bg_alpha_color="0.3 0.3 0.3 1.0">
+  >
 
   <text
    visible="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index faed615bdd..4206b87c2b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1818,6 +1818,7 @@ this texture in your inventory
 	<string name="AnimFlagStart" value=" Start Animation :   " />
 	<string name="Wave"          value=" Wave " />
 	<string name="HelloAvatar"   value=" Hello, avatar! " />
+	<string name="ViewAllGestures"  value="  View All >>" />
 				
 	<!-- inventory filter -->
     <!-- use value="" because they have preceding spaces -->
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index a34b005448..ada258fbec 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<filter_editor select_on_focus="true"
-               background_image_disabled="TextField_Search_Disabled"
-               background_image_focused="TextField_Search_Active">
-  <clear_filter_button label="" 
-                       image_unselected="Icon_Close_Foreground"
-                       image_selected="Icon_Close_Press" />
+<filter_editor
+  clear_button_visible="true"
+  search_button_visible="true"
+  text_pad_left="4" 
+  select_on_focus="true"
+  background_image="TextField_Search_Off"
+  background_image_disabled="TextField_Search_Disabled"
+  background_image_focused="TextField_Search_Active" >
+  <search_button label=""
+    top_pad="4"
+    left_pad="4" 
+    width="13"
+    height="13" 
+	  image_unselected="Search"
+	  image_selected="Search" />
+  <clear_button label=""
+   image_unselected="Icon_Close_Foreground"
+   image_selected="Icon_Close_Press" />
 </filter_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
new file mode 100644
index 0000000000..24d072a573
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<flat_list_view
+ allow_select="true"
+ item_pad="5"
+ keep_one_selected="true"
+ multi_select="false"
+ opaque="true" />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index 15b23ea9b3..f482ff3b89 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <search_editor
+  clear_button_visible="false"
+  search_button_visible="true"
   text_pad_left="4" 
   select_on_focus="true"
   background_image="TextField_Search_Off"
@@ -12,4 +14,7 @@
     height="13" 
 	  image_unselected="Search"
 	  image_selected="Search" />
+  <clear_button label=""
+   image_unselected="Icon_Close_Foreground"
+   image_selected="Icon_Close_Press" />
 </search_editor>