From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 2 Jul 2009 00:38:13 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873
 https://svn.aws.productengine.com/secondlife/pe/stable@888 ->
 viewer-2.0.0-pe-4

---
 .../skins/default/xui/en/accordion_parent.xml      |   2 +-
 indra/newview/skins/default/xui/en/menu_picks.xml  |  46 +++
 .../default/xui/en/panel_avatar_list_item.xml      |   6 +-
 .../skins/default/xui/en/panel_bottomtray.xml      |  17 +-
 .../skins/default/xui/en/panel_edit_pick.xml       |  31 +-
 .../skins/default/xui/en/panel_edit_profile.xml    |  20 +-
 .../skins/default/xui/en/panel_landmark_info.xml   | 442 +++++++++++----------
 indra/newview/skins/default/xui/en/panel_notes.xml | 281 ++++++-------
 .../newview/skins/default/xui/en/panel_people.xml  |  34 +-
 .../skins/default/xui/en/panel_pick_info.xml       |  34 +-
 .../skins/default/xui/en/panel_pick_list_item.xml  |  62 +++
 indra/newview/skins/default/xui/en/panel_picks.xml |  72 ++--
 .../newview/skins/default/xui/en/panel_places.xml  |   6 +-
 .../newview/skins/default/xui/en/panel_profile.xml | 249 +++++++-----
 .../skins/default/xui/en/panel_profile_view.xml    |  50 +--
 .../skins/default/xui/en/panel_side_tray.xml       |   2 +-
 .../default/xui/en/panel_teleport_history.xml      |   2 +-
 .../skins/default/xui/en/widgets/side_tray.xml     |  16 +-
 18 files changed, 791 insertions(+), 581 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_picks.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_pick_list_item.xml

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

diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml
index 632752b1c4..914a6eddb9 100644
--- a/indra/newview/skins/default/xui/en/accordion_parent.xml
+++ b/indra/newview/skins/default/xui/en/accordion_parent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
   <panel  border_thickness="2" name="splitter_parent"
-    can_resize="true" background_visible="true"
+    background_visible="true"
        label="splitter_parent"
        title=""
     >
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
new file mode 100644
index 0000000000..146d7d06fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Picks">
+    <menu_item_call
+     label="Info"
+     layout="topleft"
+     name="pick_info">
+        <menu_item_call.on_click
+         function="Pick.Info" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="pick_edit"
+     visible="false">
+        <menu_item_call.on_click
+         function="Pick.Edit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="pick_teleport">
+        <menu_item_call.on_click
+         function="Pick.Teleport" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="pick_map">
+        <menu_item_call.on_click
+         function="Pick.Map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="pick_separator"
+     visible="false" />
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="pick_delete"
+     visible="false">
+        <menu_item_call.on_click
+         function="Pick.Delete" />
+    </menu_item_call>
+</context_menu>
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 bf3f70f54b..3de3365539 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
@@ -47,9 +47,9 @@
   <button
     bottom="5" left="260" width="20" height="20" follows="right"
     name="info_btn" label=""
-    image_unselected="info_btn.tga" image_disabled="info_btn.tga"
-    image_selected="info_btn_active.tga" image_hover_selected="info_btn_active.tga"
-    image_disabled_selected="info_btn.tga" font="SansSerifBigBold"
+    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
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 303487f21b..1e222db7b5 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?> 
 <panel follows="left|bottom|right" name="bottom_tray" bg_opaque_color="0.25 0.25 0.25 1.0"
 		bg_alpha_color="0.25 0.25 0.25 1.0" background_visible="true" auto_resize="true"
-		left="0" bottom="0" width="1000" height="28" border_visible="false" has_border="false">
+		left="0" bottom="0" width="1000" height="28" border_visible="false">
+	<panel.string name="gesture_label">
+        	Gestures
+	</panel.string>		
 	<layout_stack name="toolbar_stack" follows="left|right|bottom|top" 
 		bottom="0" left="0" width="1000" height="25" orientation="horizontal" border_size="0" auto_resize="false">
 	
@@ -12,12 +15,16 @@
 			bevel_style="in" border_style="line" border_thickness="1"/>
 	  </panel>
 		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-		<view_border bevel_style="in" bottom="0" height="28" min_height="28" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
+		<view_border bevel_style="in" bottom="0" height="28" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
 		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="false" width="100" height="28" min_height="28">
 		<chiclet_talk name="talk" left="0" bottom="6" width="100" height="20" follows="left|right" auto_resize="false"/>	
 	  </panel>
-		<icon name="DUMMY" image_name="spacer24.tga" left="0" width="150" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
+		<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
+	  <panel follows="left|right" auto_resize="true" width="90" height="28" min_height="28">
+		<combo_box follows="left|right" height="20" label="Gestures" left="0" bottom="6" name="Gesture" top_delta="0" width="90" />
+	  </panel>
+	  	<icon name="DUMMY" image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="true" width="250" height="28" min_height="28">
 		<chiclet_panel name="chiclet_list"  follows="left|right" 
 			width="250" height="25" left="0" bottom="2"/>
@@ -29,12 +36,12 @@
 			image_unselected="im_notifications.tga" image_selected="im_notifications.tga"/>
 	  </panel>
 		<icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
-		<view_border bevel_style="in" bottom="0" height="30" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
+		<view_border name="well_separator" bevel_style="in" bottom="0" height="30" width="1" follows="left|right" left="270" mouse_opaque="false" auto_resize="false"/>
 		<icon image_name="spacer24.tga" left="0" width="10" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	  <panel follows="left|right" auto_resize="false" width="48" height="28" min_height="28">
 		<chiclet_notification name="sys_well" follows="left|right" auto_resize="false"
 			left="0" bottom="5" width="48" height="25" 
-			image_unselected="sys_notifications.tga" image_selected="sys_notifications.tga"/>
+			image_unselected="bottom_tray_sys_notifications.tga" image_selected="bottom_tray_sys_notifications.tga"/>
 	  </panel>
 		<icon image_name="spacer24.tga" left="0" width="5" height="10" bottom="0" follows="left|right" auto_resize="false" color="0 0 0 0"/>
 	</layout_stack>	
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 967cf2f539..acbbde37c9 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,7 +9,7 @@
  left="0"
  name="panel_edit_pick"
  top="0"
- width="355">
+ width="345">
     <text
      type="string"
      length="1"
@@ -33,14 +33,33 @@
      left="10"
      right="-10"
      top="30">
-        <texture_picker
+        <panel
          follows="left|top|right"
          height="150"
          layout="topleft"
          left="10"
-         name="pick_snapshot"
          right="-10"
-         top="10" />
+         top="10">
+            <panel
+             follows="left|top|right"
+             height="150"
+             layout="topleft" >
+                <texture_picker
+                 follows="left|top|right"
+                 height="150"
+                 layout="topleft"
+                 name="pick_snapshot" />
+            </panel>
+            <icon
+             height="16"
+             image_name="image_edit_icon.tga"
+             layout="topleft"
+             name="edit_icon"
+             right="-25"
+             top="30"
+             visible="false"
+             width="16" />
+        </panel>
         <text
          type="string"
          length="1"
@@ -124,11 +143,11 @@
      left="5"
      name="bottom_panel"
      top="605"
-     width="345">
+	   right="-10">
         <button
          follows="bottom|left"
          height="20"
-         label="Save Changes"
+         label="Save [WHAT]"
          layout="topleft"
          name="save_changes_btn"
          right="-120"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index e787d03eca..5f51e8d22c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -119,6 +119,24 @@
                top_pad="5"
                width="105" />
           </panel>
+          <icon
+           height="16"
+           image_name="image_edit_icon.tga"
+           layout="topleft"
+           left="75"
+           name="2nd_life_edit_icon"
+           tool_tip="Click to select an image" 
+           top="35"
+           width="16" />
+          <icon
+           height="16"
+           image_name="image_edit_icon.tga"
+           layout="topleft"
+           left="200"
+           name="1st_life_edit_icon"
+           tool_tip="Click to select an image" 
+           top="35"
+           width="16" />
       </panel>
       <text
        type="string"
@@ -189,8 +207,6 @@
           Homepage:
       </text>
       <line_editor
-       type="string"
-       length="1"
        follows="left|top|right"
        font="SansSerif"
        font.style="UNDERLINE"
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index e252788c69..7cdda126b9 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -37,222 +37,238 @@
      name="acquired_date">
         [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
     </panel.string>
-    <button
-     follows="top|left"
-     height="20"
-     image_overlay="navbar_back.tga"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
-     layout="topleft"
-     left="10"
-     name="back_btn"
-     picture_style="true"
-     top="20"
-     width="20" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top|right"
-     font="SansSerifHugeBold"
-     height="20"
-     layout="topleft"
-     left="50"
-     name="panel_title"
-     text_color="white"
-     top="20"
-     width="150">
-        Landmark
-    </text>
-    <texture_picker
-     follows="top|left"
-     height="128"
-     layout="topleft"
-     left="10"
-     name="logo"
-     top="60"
-     width="128" />
-    <text
-     follows="left|top|right"
-     font="SansSerifHugeBold"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="region_name"
-     text_color="white"
-     top="180"
-     width="340" />
-    <text
-     follows="left|top|right"
-     font="SansSerifBold"
-     height="20"
-     layout="topleft"
-     left="10"
-     name="parcel_name"
-     text_color="white"
-     top="205"
-     width="340" />
-    <panel
-     follows="left|top|right|bottom"
-     height="335"
+    <scroll_container
+     follows="all"
+     height="560"
      layout="topleft"
      left="0"
-     name="info_panel"
-     top="225"
+     top="0"
      width="355">
-        <text_editor
-         bg_focus_color="0.3 0.3 0.3 1"
-         bg_readonly_color="0.3 0.3 0.3 1"
-         follows="left|top|right"
-         font="SansSerif"
-         height="90"
-         hide_border="true"
-         hide_scrollbar="true"
+        <panel
+         height="560"
          layout="topleft"
-         left="10"
-         max_length="1000"
-         name="description"
-         read_only="true"
-         text_color="white"
+         left="0"
+         name="scrolling_panel"
          top="0"
-         width="340" />
-        <icon
-         follows="top|left"
-         height="30"
-         image_name=""
-         layout="topleft"
-         left="10"
-         mouse_opaque="true"
-         name="maturity"
-         top="95"
-         width="30" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="owner_lable"
-         text_color="white"
-         top="130"
-         width="50"
-         word_wrap="true">
-            Owner:
-        </text>
-        <text
-         follows="left|top|right"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="80"
-         name="owner"
-         text_color="white"
-         top="130"
-         width="260"
-         word_wrap="true" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="creator_lable"
-         text_color="white"
-         top="150"
-         width="50"
-         word_wrap="true">
-            Creator:
-        </text>
-        <text
-         follows="left|top|right"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="80"
-         name="creator"
-         text_color="white"
-         top="150"
-         width="260"
-         word_wrap="true" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="created_lable"
-         text_color="white"
-         top="170"
-         width="50"
-         word_wrap="true">
-            Created:
-        </text>
-        <text
-         follows="left|top|right"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="80"
-         name="created"
-         text_color="white"
-         top="170"
-         width="260"
-         word_wrap="true" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="title_lable"
-         text_color="white"
-         top="190"
-         width="50"
-         word_wrap="true">
-            Title:
-        </text>
-        <line_editor
-         follows="left|top|right"
-         font="SansSerif"
-         height="22"
-         layout="topleft"
-         left="10"
-         max_length="255"
-         name="title_editor"
-         top="210"
-         width="330" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         font="SansSerif"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="notes_lable"
-         text_color="white"
-         top="240"
-         width="90"
-         word_wrap="true">
-            My Notes:
-        </text>
-        <text_editor
-         follows="left|top|bottom|right"
-         font="SansSerif"
-         height="70"
-         hide_scrollbar="true"
-         layout="topleft"
-         left="10"
-         max_length="1000"
-         name="notes_editor"
-         top="260"
-         width="330" />
-    </panel>
+         width="310">
+            <button
+             follows="top|left"
+             height="20"
+             image_overlay="navbar_back.tga"
+             image_selected="navbar_bg_button.tga"
+             image_unselected="navbar_bg_button.tga"
+             layout="topleft"
+             left="10"
+             name="back_btn"
+             picture_style="true"
+             top="20"
+             width="20" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerifHugeBold"
+             height="20"
+             layout="topleft"
+             left="50"
+             name="panel_title"
+             text_color="white"
+             top="20"
+             width="150">
+                Landmark
+            </text>
+            <texture_picker
+             follows="top|left"
+             height="128"
+             layout="topleft"
+             left="10"
+             name="logo"
+             top="60"
+             width="128" />
+            <text
+             follows="left|top|right"
+             font="SansSerifHugeBold"
+             height="20"
+             layout="topleft"
+             left="10"
+             name="region_name"
+             text_color="white"
+             top="180"
+             width="310" />
+            <text
+             follows="left|top|right"
+             font="SansSerifBold"
+             height="20"
+             layout="topleft"
+             left="10"
+             name="parcel_name"
+             text_color="white"
+             top="205"
+             width="310" />
+            <panel
+             follows="left|top|right|bottom"
+             height="335"
+             layout="topleft"
+             left="10"
+             name="info_panel"
+             top="225"
+             width="310">
+                <text_editor
+                 bg_focus_color="0.3 0.3 0.3 1"
+                 bg_readonly_color="0.3 0.3 0.3 1"
+                 follows="left|top|right"
+                 font="SansSerif"
+                 height="90"
+                 hide_border="true"
+                 hide_scrollbar="true"
+                 layout="topleft"
+                 left="0"
+                 max_length="1000"
+                 name="description"
+                 read_only="true"
+                 text_color="white"
+                 top="0"
+                 width="310" />
+                <icon
+                 follows="top|left"
+                 height="30"
+                 image_name=""
+                 layout="topleft"
+                 left="0"
+                 mouse_opaque="true"
+                 name="maturity"
+                 top="95"
+                 width="30" />
+                <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="owner_lable"
+                 text_color="white"
+                 top="130"
+                 width="50"
+                 word_wrap="true">
+                    Owner:
+                </text>
+                <text
+                 follows="left|top|right"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="70"
+                 name="owner"
+                 text_color="white"
+                 top="130"
+                 width="240"
+                 word_wrap="true" />
+                <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="creator_lable"
+                 text_color="white"
+                 top="150"
+                 width="50"
+                 word_wrap="true">
+                    Creator:
+                </text>
+                <text
+                 follows="left|top|right"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="70"
+                 name="creator"
+                 text_color="white"
+                 top="150"
+                 width="240"
+                 word_wrap="true" />
+                <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="created_lable"
+                 text_color="white"
+                 top="170"
+                 width="50"
+                 word_wrap="true">
+                    Created:
+                </text>
+                <text
+                 follows="left|top|right"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="70"
+                 name="created"
+                 text_color="white"
+                 top="170"
+                 width="240"
+                 word_wrap="true" />
+                <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="title_lable"
+                 text_color="white"
+                 top="190"
+                 width="50"
+                 word_wrap="true">
+                    Title:
+                </text>
+                <line_editor
+                 follows="left|top|right"
+                 font="SansSerif"
+                 height="22"
+                 layout="topleft"
+                 left="0"
+                 max_length="255"
+                 name="title_editor"
+                 top="210"
+                 width="310" />
+                <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 font="SansSerif"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="notes_lable"
+                 text_color="white"
+                 top="240"
+                 width="90"
+                 word_wrap="true">
+                    My Notes:
+                </text>
+                <text_editor
+                 follows="left|top|bottom|right"
+                 font="SansSerif"
+                 height="70"
+                 hide_scrollbar="true"
+                 layout="topleft"
+                 left="0"
+                 max_length="1000"
+                 name="notes_editor"
+                 top="260"
+                 width="310" />
+            </panel>
+        </panel>
+    </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 767432a522..27e2f87fb4 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,155 +1,162 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|left|right|bottom"
- background_visible="true"
  bevel_style="in"
- bg_alpha_color="0.5 0.5 0.5 1"
- height="705"
+ height="625"
  label="Notes and Privacy"
  layout="topleft"
  left="10"
  name="panel_notes"
  top="10"
  width="355">
- <scroll_container
-      left="1" width="354" height="690" follows="left|top|right|bottom"
-	  layout="topleft"
-      reserve_scroll_corner="false">
-	  <panel
-	  layout="topleft"
-	  width="320"
-	  height="690"
-	  left="0"
-	  top="0">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerifHugeBold"
-     height="35"
+    <scroll_container
+     left="8" 
+     width="340" 
+     height="570" 
+     follows="left|top|right|bottom"
      layout="topleft"
-     left="10"
-     name="pick_title"
-     text_color="white"
-     top="10"
-     width="250"
-     word_wrap="true">
-        Private Notes
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     font.style="ITALIC"
-     height="15"
-     layout="topleft"
-     left="10"
-     name="status_message"
-     text_color="0.1 0.1 0.1 1"
-     top="50"
-     width="300">
-        Your notes about this user:
-    </text>
-    <text_editor
-     bg_focus_color="white"
-     bg_writeable_color="0.6 0.6 0.6 1"
-     follows="left|right"
-     font="SansSerif"
-     height="300"
-     hide_scrollbar="true"
-     layout="topleft"
-     left="10"
-     max_length="1000"
-     name="notes_edit"
-     text_color="black"
-     top="70"
-     width="280"
-     word_wrap="true" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerifHugeBold"
-     height="35"
-     layout="topleft"
-     left="10"
-     name="pick_title"
-     text_color="white"
-     top="410"
-     width="250"
-     word_wrap="true">
-        Private Settings
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     font.style="ITALIC"
-     height="15"
-     layout="topleft"
-     left="10"
-     name="status_message"
-     text_color="0.1 0.1 0.1 1"
-     top="435"
-     width="300">
-        This user can:
-    </text>
-    <check_box
-     enabled="false"
-     follows="left|top"
-     font="SansSerifBig"
-     height="20"
-     label="See my online status"
-     layout="topleft"
-     left="10"
-     name="status_check"
-     text_disabled_color="0.1 0.1 0.1 1"
-     text_enabled_color="white"
-     top="455"
-     width="300" />
-    <check_box
-     enabled="false"
-     follows="left|top"
-     font="SansSerifBig"
-     height="20"
-     label="See me on the map"
-     layout="topleft"
-     left="10"
-     name="map_check"
-     text_disabled_color="0.1 0.1 0.1 1"
-     text_enabled_color="white"
-     top="480"
-     width="300" />
-    <check_box
-     enabled="false"
-     follows="left|top"
-     font="SansSerifBig"
-     height="20"
-     label="Edit, delite or take my objects"
-     layout="topleft"
-     left="10"
-     name="objects_check"
-     text_disabled_color="0.1 0.1 0.1 1"
-     text_enabled_color="white"
-     top="505"
-     width="300" />
+     name="profile_scroll"
+     opaque="true"
+     color="0.5 0.5 0.5 1.0"
+     reserve_scroll_corner="false">
+        <panel
+         layout="topleft"
+         width="310"
+         height="530"
+         left="0"
+         follows="left|right"
+         top="0">
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerifHugeBold"
+             height="20"
+             layout="topleft"
+             left="10"
+             name="pick_title"
+             text_color="white"
+             top="10"
+             width="250"
+             word_wrap="true">
+                Private Notes
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             font.style="ITALIC"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="status_message"
+             text_color="0.1 0.1 0.1 1"
+             top_pad="10"
+             width="300">
+                Your notes about this user:
+            </text>
+            <text_editor
+             bg_focus_color="white"
+             bg_writeable_color="0.6 0.6 0.6 1"
+             follows="left|right"
+             font="SansSerif"
+             height="300"
+             hide_scrollbar="true"
+             layout="topleft"
+             left="10"
+             max_length="1000"
+             name="notes_edit"
+             text_color="black"
+             top_pad="10"
+             width="290"
+             word_wrap="true" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerifHugeBold"
+             height="20"
+             layout="topleft"
+             left="10"
+             name="pick_title"
+             text_color="white"
+             top_pad="10"
+             width="250"
+             word_wrap="true">
+                Private Settings
+            </text>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             font="SansSerif"
+             font.style="ITALIC"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="status_message"
+             text_color="0.1 0.1 0.1 1"
+             top_pad="10"
+             width="300">
+                This user can:
+            </text>
+            <check_box
+             enabled="false"
+             follows="left|top"
+             font="SansSerifBig"
+             height="20"
+             label="See my online status"
+             layout="topleft"
+             left="10"
+             name="status_check"
+             text_disabled_color="0.1 0.1 0.1 1"
+             text_enabled_color="white"
+             top_pad="10"
+             width="300" />
+            <check_box
+             enabled="false"
+             follows="left|top"
+             font="SansSerifBig"
+             height="20"
+             label="See me on the map"
+             layout="topleft"
+             left="10"
+             name="map_check"
+             text_disabled_color="0.1 0.1 0.1 1"
+             text_enabled_color="white"
+             top_pad="10"
+             width="300" />
+            <check_box
+             enabled="false"
+             follows="left|top"
+             font="SansSerifBig"
+             height="20"
+             label="Edit, delite or take my objects"
+             layout="topleft"
+             left="10"
+             name="objects_check"
+             text_disabled_color="0.1 0.1 0.1 1"
+             text_enabled_color="white"
+             top_pad="10"
+             width="300" />
+        </panel>
+    </scroll_container>
     <panel
 	 layout="topleft"
      follows="bottom"
      height="30"
-     left="0"
+     left="8"
      name="notes_buttons_panel"
-     bottom="690"
-     width="350">
-      <button
+     bottom="625"
+     width="345">
+        <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Add Friend"
          layout="topleft"
-         left="5"
+         left="0"
          mouse_opaque="false"
          name="add_friend"
          top="0"
@@ -162,7 +169,7 @@
          layout="topleft"
          left_pad="5"
          name="im"
-         top_delta="0"
+         top="0"
          width="40" />
         <button
          follows="bottom|left"
@@ -172,7 +179,7 @@
          layout="topleft"
          left_pad="5"
          name="call"
-         top_delta="0"
+         top="0"
          width="50"
          enabled="false"/>
         <button
@@ -183,7 +190,7 @@
          layout="topleft"
          left_pad="5"
          name="teleport"
-         top_delta="0"
+         top="0"
          width="65" />
         <button
          follows="bottom|left"
@@ -191,12 +198,10 @@
          height="25"
          label="Share"
          layout="topleft"
-         left_pad="15"
+         left_pad="5"
          name="share"
-         top_delta="0"
+         top="0"
          width="50"
          enabled="false"/>
     </panel>
-</panel>
-	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f53e06494f..ae385731f9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -82,9 +82,9 @@
           top="9" left="10" width="16" height="16"
           follows="bottom|left"
           font="SansSerifBigBold"
-          image_hover_selected="add_btn.tga"
-          image_selected="add_btn.tga"
-          image_unselected="add_btn.tga" picture_style="true"
+          image_hover_selected="plus.tga"
+          image_selected="plus.tga"
+          image_unselected="plus.tga" picture_style="true"
         />
         <button
           name="del_btn"
@@ -92,9 +92,9 @@
           top_delta="0" left_pad="24" width="16" height="16"
           follows="bottom|left"
           font="SansSerifBigBold"
-          image_hover_selected="del_btn.tga"
-          image_selected="del_btn.tga"
-          image_unselected="del_btn.tga"
+          image_hover_selected="minus.tga"
+          image_selected="minus.tga"
+          image_unselected="minus.tga"
           picture_style="true"
         />
         <button
@@ -137,9 +137,9 @@
           top="9" left="10" width="16" height="16"
           follows="bottom|left"
           font="SansSerifBigBold"
-          image_hover_selected="add_btn.tga"
-          image_selected="add_btn.tga"
-          image_unselected="add_btn.tga"
+          image_hover_selected="plus.tga"
+          image_selected="plus.tga"
+          image_unselected="plus.tga"
           picture_style="true"
         />
         <button
@@ -148,9 +148,9 @@
           top_delta="0" left_pad="24" width="16" height="16"
           follows="bottom|left"
           font="SansSerifBigBold"
-          image_hover_selected="del_btn.tga"
-          image_selected="del_btn.tga"
-          image_unselected="del_btn.tga"
+          image_hover_selected="minus.tga"
+          image_selected="minus.tga"
+          image_unselected="minus.tga"
           picture_style="true"
         />
         <button
@@ -159,9 +159,9 @@
           top_delta="0" left_pad="24" width="16" height="16"
           follows="bottom|left"
           font="SansSerifBigBold"
-          image_hover_selected="activate_btn.tga"
-          image_selected="activate_btn.tga"
-          image_unselected="activate_btn.tga"
+          image_hover_selected="group_activate_btn.tga"
+          image_selected="group_activate_btn.tga"
+          image_unselected="group_activate_btn.tga"
           picture_style="true"
         />
         <button
@@ -434,8 +434,8 @@
 	class="panel_profile_view" 
 	filename="panel_profile_view.xml"
 	top="0"
-	left="5"
-	width="345"
+	left="0"
+	width="355"
 	height="465"
 	follows="left|right|top|bottom"
 	visible="false"
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 fa04ba7f15..9fc1627cb9 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  bg_alpha_color="0.2 0.2 0.2 1"
- height="640"
+ height="660"
  layout="topleft"
  left="0"
  name="panel_pick_info"
@@ -39,7 +39,7 @@
      background_visible="true"
      bg_alpha_color="0.5 0.5 0.5 1"
      follows="left|right|top|bottom"
-     height="570"
+     height="580"
      layout="topleft"
      left="10"
      right="-10"
@@ -133,52 +133,50 @@
      follows="left|right|bottom"
      height="30"
      layout="topleft"
-     left="10"
+     left="8"
      name="buttons"
      right="-10"
-     top_pad="2">
+     bottom="660">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Edit"
          layout="topleft"
-         left="10"
+         left="0"
          name="edit_btn"
-         top="3"
+         top="0"
          width="50" />
         <button
-         enabled="false"
-		 follows="bottom|left"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Teleport"
          layout="topleft"
-         left="65"
+         left_pad="5"
          name="teleport_btn"
-         top="3"
+         top="0"
          width="70" />
         <button
-         enabled="false"
-		 follows="bottom|left"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Show on Map"
          layout="topleft"
-         left="140"
+         left_pad="5"
          name="show_on_map_btn"
-         top="3"
+         top="0"
          width="90" />
         <button
-		 enabled="false"
-		 follows="bottom|right"
+         enabled="false"
+         follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Verb"
          layout="topleft"
-         left="270"
+         right="-5"
          name="verb_btn"
-         top="3"
+         top="0"
          width="50" />
     </panel>
 </panel>
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
new file mode 100644
index 0000000000..a4599bdf1e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ bg_alpha_color="0.4 0.4 0.4 1"
+ bg_opaque_color="0.4 0.4 0.4 1"
+ border="true"
+ follows="top|left|right"
+ height="80"
+ layout="topleft"
+ left="0"
+ name="picture_item"
+ top="80"
+ width="310">
+    <texture_picker
+     allow_no_texture="true"
+     default_image_name="None"
+     enabled="false"
+     follows="left|top"
+     height="80"
+     layout="topleft"
+     left="5"
+     mouse_opaque="false"
+     name="picture"
+     tab_stop="false"
+     top="7"
+     width="90" />
+    <text
+     follows="right"
+     font="SansSerifBold"
+     height="20"
+     layout="topleft"
+     left="100"
+     name="picture_name"
+     text_color="black"
+     top="5"
+     width="170" />
+    <text
+     follows="right"
+     font="SansSerif"
+     height="40"
+     layout="topleft"
+     left="100"
+     name="picture_descr"
+     text_color="white"
+     top="25"
+     width="170"
+     word_wrap="true" />
+    <button
+     follows="right"
+     height="20"
+     image_disabled="navbar_bg_button.tga"
+     image_disabled_selected="navbar_bg_button.tga"
+     image_overlay="navbar_forward.tga"
+     image_selected="navbar_bg_button.tga"
+     image_unselected="navbar_bg_button.tga"
+     layout="topleft"
+     name="inspector"
+     picture_style="true"
+     right="-5"
+     tab_stop="false"
+     top="28"
+     width="20" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 95055f43dc..ed851452fe 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
  bevel_style="in"
- bg_alpha_color="0.5 0.5 0.5 1"
- height="690"
+ follows="left|top|right|bottom"
+ height="625"
  label="Picks"
  layout="topleft"
  left="0"
@@ -15,7 +14,7 @@
      length="1"
      follows="top|left|right"
      font="SansSerifHugeBold"
-     height="55"
+     height="50"
      layout="topleft"
      left="10"
      name="pick_title"
@@ -44,22 +43,23 @@
     </text>
     <scroll_container
      follows="left|top|right|bottom"
-     height="550"
+     height="495"
      layout="topleft"
-     left="5"
-     reserve_scroll_corner="true"
-     width="345">
+     left="8"
+     name="profile_scroll"
+     opaque="true"
+     color="0.5 0.5 0.5 1.0"
+     reserve_scroll_corner="false"
+     top_pad="0"
+     width="340">
         <panel
-         background_visible="true"
          bevel_style="in"
-         bg_alpha_color="0.6 0.6 0.6 1"
-         follows="left|top|right|bottom"
-         height="600"
+         height="40"
          layout="topleft"
          left="0"
          name="back_panel"
          top="0"
-         width="325" />
+         width="310" />
     </scroll_container>
     <panel
      background_visible="true"
@@ -70,10 +70,11 @@
      height="25"
      label="bottom_panel"
      layout="topleft"
-     left="5"
+     left="8"
      name="edit_panel"
      visible="false"
-     width="345">
+     top_pad="0"
+     width="340">
         <button
          enabled="false"
          follows="bottom|left"
@@ -92,27 +93,27 @@
          follows="bottom|left"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="add_btn.tga"
-         image_disabled_selected="add_btn.tga"
-         image_hover_selected="add_btn.tga"
-         image_selected="add_btn.tga"
-         image_unselected="add_btn.tga"
+         image_disabled="plus.tga"
+         image_disabled_selected="plus.tga"
+         image_hover_selected="plus.tga"
+         image_selected="plus.tga"
+         image_unselected="plus.tga"
          layout="topleft"
          left="35"
          name="new_btn"
          picture_style="true"
-		 tool_tip="Create New Pick at Current Location"
+         tool_tip="Create New Pick at Current Location"
          top="5"
          width="16" />
         <button
          follows="bottom|right"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="del_btn.tga"
-         image_disabled_selected="del_btn.tga"
-         image_hover_selected="del_btn.tga"
-         image_selected="del_btn.tga"
-         image_unselected="del_btn.tga"
+         image_disabled="minus.tga"
+         image_disabled_selected="minus.tga"
+         image_hover_selected="minus.tga"
+         image_selected="minus.tga"
+         image_unselected="minus.tga"
          layout="topleft"
          name="trash_btn"
          picture_style="true"
@@ -121,12 +122,12 @@
          width="16" />
     </panel>
     <panel
-     follows="left|right"
-     height="25"
+     follows="bottom|left"
+     height="30"
      layout="topleft"
-     left="0"
+     left="8"
      name="buttons_cucks"
-     top_pad="10"
+     bottom="625"
      width="345">
         <button
          follows="bottom|left"
@@ -134,8 +135,9 @@
          height="25"
          label="Info"
          layout="topleft"
-         left="10"
+         left="0"
          name="info_btn"
+         enabled="false"
          top="0"
          width="50" />
         <button
@@ -144,8 +146,9 @@
          height="25"
          label="Teleport"
          layout="topleft"
-         left="65"
+         left_pad="5"
          name="teleport_btn"
+         enabled="false"
          top="0"
          width="70" />
         <button
@@ -154,8 +157,9 @@
          height="25"
          label="Show on Map"
          layout="topleft"
-         left="140"
+         left_pad="5"
          name="show_on_map_btn"
+         enabled="false"
          top="0"
          width="90" />
         <button
@@ -165,7 +169,7 @@
          height="25"
          label="Verb"
          layout="topleft"
-         left="270"
+         left="280"
          name="verb_btn"
          top="0"
          width="50" />
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 66bb38b45e..272a7f4328 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -45,7 +45,7 @@
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
-     label="TELEPORT"
+     label="Teleport"
      layout="topleft"
      left_delta="10"
      name="teleport_btn"
@@ -55,7 +55,7 @@
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
-     label="SHOW ON MAP"
+     label="Show on Map"
      layout="topleft"
      left_pad="5"
      name="map_btn"
@@ -66,7 +66,7 @@
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
-     label="SHARE"
+     label="Share"
      layout="topleft"
      left_pad="5"
      name="share_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index a4363d5858..f99d629aed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
  bevel_style="in"
- bg_alpha_color="0.5 0.5 0.5 1"
  follows="left|top|right|bottom"
- height="705"
+ height="625"
  label="Profile"
  layout="topleft"
  left="10"
@@ -52,19 +50,52 @@
      name="NotAgeVerified">
         Not Age-verified
     </panel.string>
+    <panel.string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=en
+    </panel.string>
+    <panel.string
+     name="my_account_link_url">
+        http://secondlife.com/account
+    </panel.string>
+    <panel.string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=en
+    </panel.string>
+    <panel.string
+     name="no_partner_text">
+        None
+    </panel.string>
     <scroll_container
+     color="0.5 0.5 0.5 1.0"
      follows="left|top|right|bottom"
-     height="690"
+     height="570"
      layout="topleft"
-     left="1"
-	 name="profile_scroll"
-     width="354">
+     left="8"
+     name="profile_scroll"
+     opaque="true"
+     reserve_scroll_corner="false"
+     width="340">
         <panel
-         height="710"
+         height="680"
          layout="topleft"
          left="0"
          top="0"
-         width="320">
+         width="310">
+            <text 
+             type="string"
+             follows="top|left|right"
+             font="SansSerifHugeBold" 
+             height="20" 
+             layout="topleft" 
+             left="9" 
+             name="user_name" 
+             text_color="white" 
+             top="0" 
+             mouse_opaque="true" 
+             width="320">
+              (Loading...)
+            </text> 
             <panel
              follows="left|top"
              height="120"
@@ -146,8 +177,8 @@
              layout="topleft"
              left="0"
              name="status_panel"
-             top="135"
-             width="300">
+             top="155"
+             width="320">
                 <text
                  follows="left|top"
                  font="SansSerifBold"
@@ -160,7 +191,6 @@
                  width="100" />
                 <text
                  type="string"
-                 length="1"
                  follows="left|top"
                  font="SansSerifBold"
                  font.style="ITALIC"
@@ -179,7 +209,7 @@
              layout="topleft"
              left="0"
              name="status_me_panel"
-             top="135"
+             top="155"
              width="300">
                 <text
                  type="string"
@@ -223,7 +253,6 @@
                     What&apos;re you up to?
                 </text>
                 <line_editor
-                 type="string"
                  border_style="line"
                  border_thickness="1"
                  follows="left|top|right"
@@ -336,6 +365,7 @@
              follows="left|top|right"
              font="SansSerif"
              font.style="UNDERLINE"
+             font_shadow="hard" 
              height="15"
              layout="topleft"
              left="9"
@@ -402,16 +432,17 @@
              layout="topleft"
              left="9"
              name="account_actions_panel"
-             width="335">
+             width="300">
                 <text
                  type="string"
                  follows="left|top"
                  font="SansSerif"
                  font.style="UNDERLINE"
+                 font_shadow="hard" 
                  height="15"
                  layout="topleft"
                  left="0"
-                 name="my_account_link"
+                 name="payment_update_link"
                  text_color="0.2 0.2 1 1"
                  top="0"
                  width="65">
@@ -422,6 +453,7 @@
                  follows="left|top"
                  font="SansSerif"
                  font.style="UNDERLINE"
+                 font_shadow="hard" 
                  height="15"
                  layout="topleft"
                  left="70"
@@ -450,7 +482,7 @@
              layout="topleft"
              left="9"
              name="partner_data_panel"
-             width="335">
+             width="300">
                 <text
                  type="string"
                  follows="left|top|right"
@@ -470,10 +502,11 @@
                  follows="top|right"
                  font="SansSerif"
                  font.style="UNDERLINE"
+                 font_shadow="hard" 
                  halign="right"
                  height="15"
                  layout="topleft"
-                 left="270"
+                 left="250"
                  name="partner_edit_link"
                  text_color="0.2 0.2 1 1"
                  top="0"
@@ -481,94 +514,98 @@
                     Edit
                 </text>
             </panel>
-            <panel
-             follows="left|top"
-             height="30"
-             layout="topleft"
-             name="profile_buttons_panel"
-             width="350">
-                <button
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Add Friend"
-                 layout="topleft"
-                 left="5"
-                 mouse_opaque="false"
-                 name="add_friend"
-                 top="0"
-                 width="75" />
-                <button
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="IM"
-                 layout="topleft"
-                 left_pad="5"
-                 name="im"
-                 top_delta="0"
-                 width="40" />
-                <button
-                 enabled="false"
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Call"
-                 layout="topleft"
-                 left_pad="5"
-                 name="call"
-                 top_delta="0"
-                 width="50" />
-                <button
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Teleport"
-                 layout="topleft"
-                 left_pad="5"
-                 name="teleport"
-                 top_delta="0"
-                 width="65" />
-                <button
-                 enabled="false"
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Share"
-                 layout="topleft"
-                 left_pad="15"
-                 name="share"
-                 top_delta="0"
-                 width="50" />
-            </panel>
-            <panel
-             follows="left|top"
-             height="30"
-             layout="topleft"
-             name="profile_me_buttons_panel"
-			 visible="false"
-             width="350">
-                <button
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Edit Profile"
-                 layout="topleft"
-                 left="0"
-                 name="edit_profile_btn"
-                 top="0"
-                 width="105" />
-                <button
-                 follows="bottom|left"
-                 font="SansSerifSmallBold"
-                 height="25"
-                 label="Edit Appearance"
-                 layout="topleft"
-                 left_pad="15"
-                 name="edit_appearance_btn"
-                 top_delta="0"
-                 width="130" />
-            </panel>
         </panel>
     </scroll_container>
+    <panel
+     bottom="625"
+     follows="bottom|left"
+     height="30"
+     layout="topleft"
+     left="8"
+     name="profile_buttons_panel"
+     width="345">
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Add Friend"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="add_friend"
+         top="0"
+         width="75" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="IM"
+         layout="topleft"
+         left_pad="5"
+         name="im"
+         top="0"
+         width="40" />
+        <button
+         enabled="false"
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Call"
+         layout="topleft"
+         left_pad="5"
+         name="call"
+         top="0"
+         width="50" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Teleport"
+         layout="topleft"
+         left_pad="5"
+         name="teleport"
+         top="0"
+         width="65" />
+        <button
+         enabled="false"
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Share"
+         layout="topleft"
+         left_pad="5"
+         name="share"
+         top="0"
+         width="50" />
+    </panel>
+    <panel
+     bottom="625"
+     follows="bottom|left"
+     height="30"
+     layout="topleft"
+     left="8"
+     name="profile_me_buttons_panel"
+     visible="false"
+     width="345">
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Edit Profile"
+         layout="topleft"
+         left="0"
+         name="edit_profile_btn"
+         top="0"
+         width="105" />
+        <button
+         follows="bottom|left"
+         font="SansSerifSmallBold"
+         height="25"
+         label="Edit Appearance"
+         layout="topleft"
+         left_pad="5"
+         name="edit_appearance_btn"
+         top="0"
+         width="130" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index fa919776a7..428d071db2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -10,32 +10,32 @@
  name="panel_target_profile"
  top="0"
  width="355">
-	<button 
-		layout="topleft" 
-		name="back" 
-		left="0" 
-		top="5" 
-		width="20" 
-		height="20" 
-		label=""
-		follows="top|left"
-		image_selected="navbar_bg_button.tga"
-		image_unselected="navbar_bg_button.tga"
-		image_overlay="navbar_back.tga"/>
-	<text 
-		layout="topleft" 
-		top="0" 
-		left="30" 
-		width="150" 
-		height="20" 
-		font="SansSerifHugeBold" 
-		text_color="white" 
-		follows="top|left"
-		mouse_opaque="true" 
-		name="user_name">(Loading...)</text> 
+    <button 
+     layout="topleft" 
+     name="back" 
+     left="5" 
+     top="5" 
+     width="20" 
+     height="20" 
+     label=""
+     follows="top|left"
+     image_selected="navbar_bg_button.tga"
+     image_unselected="navbar_bg_button.tga"
+     image_overlay="navbar_back.tga"/>
+    <text 
+     layout="topleft" 
+     top="0" 
+     left_pad="15" 
+     width="320" 
+     height="20" 
+     font="SansSerifHugeBold" 
+     text_color="white" 
+     follows="top|left|right"
+     mouse_opaque="true" 
+     name="user_name">(Loading...)</text> 
     <tab_container
      follows="left|top|right|bottom"
-     height="600"
+     height="625"
      layout="topleft"
      left="0"
      name="profile_tabs"
@@ -54,7 +54,7 @@
          label="Picks"
          layout="topleft"
          name="panel_picks"/>
-		 <panel
+        <panel
          class="panel_notes"
          filename="panel_notes.xml"
          label="Notes"
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 220191ddaa..ce8cb97f56 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -52,7 +52,7 @@
       title="Places" 
       collapsable="true" 
       min_width="355" 
-      min_height="570" 
+      min_height="200" 
       header_visible="false"
     >
       <panel 
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 b7ce812dc8..330bc362d2 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -1,7 +1,7 @@
 <?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" can_resize="true" column_padding="0" draw_heading="true"
+	<scroll_list bottom="0" column_padding="0" draw_heading="true"
 	     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" >
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index e3b70ba6e2..55ec18f292 100644
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<side_tray tab_btn_image="sidebar_tab_left.tga"
-        tab_btn_image_selected="sidebar_tab_left_selected.tga"
-		tab_btn_width = "32"
-		tab_btn_height = "32"
-		tab_btn_margin = "0"
-        >
-</side_tray>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<side_tray tab_btn_image="sidebar_tab_left.tga"
+        tab_btn_image_selected="sidebar_tab_left_selected.tga"
+		tab_btn_width = "32"
+		tab_btn_height = "32"
+		tab_btn_margin = "0"
+        >
+</side_tray>
-- 
cgit v1.2.3