From af98aad98d43ec8b128ecac3089426d6ae6edc3f Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 26 Aug 2009 20:47:27 +0000
Subject: svn merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471
 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 ->
 viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455
 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558
 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568
 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601
 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632
 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682
 EXT-692 EXT-703 EXT-717

---
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../skins/default/xui/en/panel_edit_pick.xml       |   6 +-
 .../skins/default/xui/en/panel_edit_profile.xml    |   6 +-
 .../skins/default/xui/en/panel_group_general.xml   |  32 +--
 .../default/xui/en/panel_group_info_sidetray.xml   |  27 ++-
 .../skins/default/xui/en/panel_group_invite.xml    |   4 +
 .../default/xui/en/panel_group_land_money.xml      |   4 +-
 .../skins/default/xui/en/panel_group_notify.xml    |   2 +-
 .../skins/default/xui/en/panel_group_roles.xml     |  11 +-
 .../skins/default/xui/en/panel_instant_message.xml |  80 +++++++
 .../skins/default/xui/en/panel_navigation_bar.xml  |   4 +-
 indra/newview/skins/default/xui/en/panel_notes.xml | 230 +++++++++++----------
 .../newview/skins/default/xui/en/panel_people.xml  |  15 ++
 .../skins/default/xui/en/panel_pick_info.xml       |  41 +++-
 indra/newview/skins/default/xui/en/panel_picks.xml | 175 ++++++++--------
 .../skins/default/xui/en/panel_profile_view.xml    |  76 ++++---
 .../default/xui/en/panel_stand_stop_flying.xml     |   2 +
 .../skins/default/xui/en/panel_status_bar.xml      |  46 -----
 .../skins/default/xui/en/panel_sys_well_item.xml   |   1 +
 indra/newview/skins/default/xui/en/panel_toast.xml |   1 +
 indra/newview/skins/default/xui/en/strings.xml     |   5 +
 .../default/xui/en/widgets/location_input.xml      |   2 +
 22 files changed, 442 insertions(+), 329 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_instant_message.xml

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ad208806b7..29492ebbdf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -381,6 +381,7 @@
   <texture name="icon_groupnoticeinventory.tga"/>
   <texture name="icon_lock.tga"/>
   <texture name="icon_place.tga"/>
+  <texture name="icon_place_for_sale.tga"/>
   <texture name="icon_popular.tga"/>
   <texture name="icon_top_pick.tga"/>
 
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 a74f560753..28cb3bc551 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -19,7 +19,7 @@
      left="10"
      name="title"
      text_color="white"
-     top="0"
+     top="17"
      width="250">
         Edit Pick
     </text>
@@ -28,11 +28,11 @@
      bg_alpha_color="DkGray2"
      width="280"
      follows="left|right|top|bottom"
-     height="570"
+     height="560"
      layout="topleft"
      left="10"
      right="-10"
-     top="30">
+     top_pad="5">
         <panel
          follows="left|top|right"
          height="150"
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 b336c86e95..c870e24e59 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -13,8 +13,8 @@
  top="10"
  width="305">
     <text     
-     top="0" 
-     left="9" 
+     top="16" 
+     left="11" 
      height="20" 
      follows="left|top"
      font="SansSerifHugeBold" 
@@ -28,7 +28,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      follows="left|top|right|bottom"  
-     height="620"
+     height="604"
      layout="topleft"
      left="9"
      name="data_panel" 
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index a38d7eee36..2243df951e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="500"
+ height="470"
  label="General"
  class="panel_group_general"
  layout="topleft"
@@ -43,39 +43,17 @@ Hover your mouse over the options for more help.
     <text_editor
      type="string"
      follows="left|top"
-     left="10"
+     left="95"
      height="75"
      hide_scrollbar="true"
      layout="topleft"
      max_length="511"
      name="charter"
-     top_pad="4"
-     width="260"
+     top="30"
+     width="170"
      word_wrap="true">
         Group Charter
     </text_editor>
-    <!--<button
-     follows="left|top"
-     height="20"
-     font="SansSerifSmall"
-     label="Join (L$0)"
-     label_selected="Join (L$0)"
-     layout="topleft"
-     left="10"
-     name="join_button"
-     top_pad="10"
-     width="85" />
-    <button
-     follows="left|top"
-     height="20"
-     font="SansSerifSmall"
-     label="Details"
-     label_selected="Detailed View"
-     layout="topleft"
-     left_delta="0"
-     name="info_button"
-     top_delta="0"
-     width="85" /> -->
     <text
       follows="left|top"
      type="string"
@@ -83,7 +61,7 @@ Hover your mouse over the options for more help.
      tool_tip="Owners are shown in bold."
      height="16"
      layout="topleft"
-     left_delta="0"
+     left="5"
      name="text_owners_and_visible_members"
      top_pad="10"
      width="270">
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 be68187eaf..65d1e3c3a7 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,26 +16,25 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-
-	<button 
+    
+    <button 
      layout="topleft" 
      name="back" 
-     left="5" 
-     top="5" 
-     width="20" 
-     height="20" 
+     right="-9" 
+     top="0" 
+     width="25" 
+     height="25" 
      label=""
      follows="top|left"
-     image_selected="navbar_bg_button.tga"
-     image_unselected="navbar_bg_button.tga"
-     image_overlay="navbar_back.tga"/>
+     image_overlay="BackArrow_Off"
+     tab_stop="false" />
     <text 
      layout="topleft" 
-     top="5" 
-     left_pad="15" 
-     width="200" 
+     top="0" 
+     left="10" 
+     width="250" 
      height="20" 
-     font="SansSerifBold" 
+     font="SansSerifHugeBold" 
      text_color="white" 
      follows="top|left|right"
      mouse_opaque="true" 
@@ -100,7 +99,7 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="panel_me_profile">
+      <accordion layout="topleft" left="2" width="296" top="135" height="600" follows="all" name="group_accordion">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 43457ddd61..68b30faa1c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -15,6 +15,10 @@
      name="loading">
         (loading...)
     </panel.string>
+    <panel.string
+     name="already_in_group">
+        Some avatars are already in group and were not invited.
+    </panel.string>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 4d373fbf3a..069cf1d7bd 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="490"
+ height="410"
  label="Land &amp; L$"
  layout="topleft"
  left="1"
@@ -59,7 +59,7 @@
      heading_height="14"
      height="100"
      layout="topleft"
-     left_delta="0"
+     left="5"
      name="group_parcel_list"
      top_pad="10"
      width="265">
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index a39a681f83..8ebf1b69a7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -9,7 +9,7 @@
 			top="5"  left="5" mouse_opaque="true" name="group_icon"/>
 		<text type="string" length="1" follows="left|top|right|bottom"
 			font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
-			text_color="GroupNotifyTextColor" top="20" width="300">
+			text_color="GroupNotifyTextColor" top="20" width="275" use_ellipses="true">
 			Sender Name / Group Name
         </text>
 	</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 37c332b2b7..9ae165cbb9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -193,7 +193,7 @@ clicking on their names.
          height="20"
          follows="left|top|right"
          max_length="250"
-         label="Filter Roles"
+         label="Filter People"
          name="filter_input"
          font="SansSerif"
          background_image="TextField_Search_Off"
@@ -326,7 +326,7 @@ including the Everyone and Owner Roles.
             height="20"
             follows="left|top|right"
             max_length="250"
-            label="Filter People"
+            label="Filter Roles"
             name="filter_input"
             font="SansSerif"
             background_image="TextField_Search_Off"
@@ -507,7 +507,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </panel>
     </tab_container>
     <panel
-     height="50"
+     height="170"
      layout="topleft"
      follows="left|top"
      left="10"
@@ -540,7 +540,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <scroll_list
          draw_stripes="false"
-         enabled="false"
          follows="left|top"
          height="150"
          layout="topleft"
@@ -559,7 +558,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
         <scroll_list
          draw_stripes="false"
-         enabled="false"
          height="150"
          layout="topleft"
          follows="left|top"
@@ -686,7 +684,6 @@ things in this group. There&apos;s a broad variety of Abilities.
         </text>
         <name_list
          draw_stripes="false"
-         enabled="false"
          height="150"
          layout="topleft"
          left="0"
@@ -783,7 +780,6 @@ things in this group. There&apos;s a broad variety of Abilities.
             Members with Ability
         </text>
         <scroll_list
-         enabled="false"
          height="150"
          layout="topleft"
          left="0"
@@ -791,7 +787,6 @@ things in this group. There&apos;s a broad variety of Abilities.
          top="90"
          width="130" />
         <name_list
-         enabled="false"
          height="150"
          layout="topleft"
          left_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
new file mode 100644
index 0000000000..169fde7b47
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bevel_style="in"
+ bg_alpha_color="0.3 0.3 0.3 0"
+ height="140"
+ label="im_panel"
+ layout="topleft"
+ left="0"
+ name="im_panel"
+ top="0"
+ width="350">
+    <panel
+     background_visible="true"
+     bevel_style="in"
+     bg_alpha_color="black"
+     follows="top"
+     height="30"
+     label="im_header"
+     layout="topleft"
+     left="5"
+     name="im_header"
+     top="5"
+     width="340">
+        <avatar_icon
+         follows="right"
+         height="20"
+         image_name="icon_avatar_online.tga"
+         layout="topleft"
+         left="5"
+         mouse_opaque="true"
+         name="avatar"
+         top="5"
+         width="20" />
+        <text
+         follows="left|right"
+         font="SansSerifBigBold"
+         height="20"
+         layout="topleft"
+         left_pad="10"
+         name="user_name"
+         text_color="white"
+         top="5"
+         value="Darth Vader"
+         width="250" />
+        <text
+         follows="right"
+         font="SansSerifBig"
+         height="20"
+         layout="topleft"
+         left_pad="10"
+         name="time_box"
+         text_color="white"
+         top="5"
+         value="23:30"
+         width="50" />
+    </panel>
+    <text
+     follows="left|bottom|right"
+     height="60"
+     layout="topleft"
+     left="10"
+     name="message"
+     text_color="white"
+     top="40"
+     use_ellipses="true"
+     value="MESSAGE"
+     width="330"
+     word_wrap="true" />
+    <button
+     follows="bottom"
+     font="SansSerifBigBold"
+     height="25"
+     label="reply"
+     layout="topleft"
+     left="120"
+     name="reply"
+     top="110"
+     width="110" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index f821dcd839..dee911a45d 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -116,12 +116,12 @@
 	     follows="right|top"
 	     halign="right"
 	     height="22"
-	     label="Search All"
+	     label="Search"
 	     layout="topleft"
 	     left_pad="7"
 	     mouse_opaque="false"
 	     name="search_input"
-	     tool_tip="Search All"
+	     tool_tip="Search"
 	     top_delta="0"
 	     width="200" />        
 	</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 188f405e13..12badfccf0 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -9,114 +9,136 @@
  name="panel_notes"
  top="0"
  width="285">
-    <scroll_container
-     color="DkGray2"
-     follows="left|top|right|bottom"
-     height="350"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
+     follows="all"
      layout="topleft"
-     left="2"
-     name="profile_scroll"
-     opaque="true"
+     left="0"
      top="0"
-     width="284">
-      <panel
-		 height="350"
-		 layout="topleft"
-		 name="profile_scroll_panel"
-		 top="0"
-		 width="284">
-        <text
-         follows="left|top"
-         font="SansSerifBold"
-         height="16"
+     height="420"
+     width="285"
+     border_size="0">
+        <panel
+         name="notes_stack"
+         follows="all"
          layout="topleft"
-         left="10"
-         name="status_message"
-         text_color="white"
          top="0"
-         value="My private notes:"
-         width="230" />
-        <text_editor
-         follows="left|top"
-         height="200"
-         hide_scrollbar="true"
-         layout="topleft"
-         left="10"
-         max_length="1000"
-         name="notes_edit"
-         text_color="black"
-         top_pad="10"
-         width="255"
-         word_wrap="true" />
-        <text
-         follows="left|top"
-         font="SansSerifBold"
-         height="16"
-         layout="topleft"
-         left="10"
-         name="status_message2"
-         text_color="white"
-         top_pad="10"
-         value="Let this person:"
-         width="225" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="See my online status"
-         layout="topleft"
-         left="20"
-         name="status_check"
-         top_pad="0"
-         width="230" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="See me on the map"
-         layout="topleft"
-         left="20"
-         name="map_check"
-         top_pad="0"
-         width="230" />
-        <check_box
-         enabled="false"
-         height="20"
-         label="Edit, delete or take my objects"
-         layout="topleft"
-         left="20"
-         name="objects_check"
-         top_pad="0"
-         width="230" />
-      </panel>
-    </scroll_container>
-    <panel
-     follows="bottom|left"
-     height="30"
-     layout="topleft"
-     left="10"
-     name="notes_buttons_panel"
-     top_pad="5"
-     width="280">
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Teleport"
-         layout="topleft"
          left="0"
-         name="teleport_btn"
-         top="0"
-         width="75" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Map"
+         height="390"
+         width="285">
+            <scroll_container
+             color="DkGray2"
+             follows="left|top|right|bottom"
+             height="390"
+             layout="topleft"
+             left="0"
+             name="profile_scroll"
+             opaque="true"
+             top="0"
+             width="285">
+              <panel
+                 height="350"
+                 layout="topleft"
+                 name="profile_scroll_panel"
+                 top="0"
+                 left="0"
+                 width="240">
+                <text
+                 follows="left|top"
+                 font="SansSerifBold"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="status_message"
+                 text_color="white"
+                 top="0"
+                 value="My private notes:"
+                 width="230" />
+                <text_editor
+                 follows="left|top"
+                 height="200"
+                 hide_scrollbar="true"
+                 layout="topleft"
+                 left="10"
+                 max_length="1000"
+                 name="notes_edit"
+                 text_color="black"
+                 top_pad="10"
+                 width="235"
+                 word_wrap="true" />
+                <text
+                 follows="left|top"
+                 font="SansSerifBold"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="status_message2"
+                 text_color="white"
+                 top_pad="10"
+                 value="Let this person:"
+                 width="225" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="See my online status"
+                 layout="topleft"
+                 left="20"
+                 name="status_check"
+                 top_pad="0"
+                 width="230" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="See me on the map"
+                 layout="topleft"
+                 left="20"
+                 name="map_check"
+                 top_pad="0"
+                 width="230" />
+                <check_box
+                 enabled="false"
+                 height="20"
+                 label="Edit, delete or take my objects"
+                 layout="topleft"
+                 left="20"
+                 name="objects_check"
+                 top_pad="0"
+                 width="230" />
+              </panel>
+            </scroll_container>
+        </panel>
+        <panel
+         follows="bottom"
+         height="30"
          layout="topleft"
-         name="show_on_map_btn"
-         top="0"
-         left_pad="5"
-         width="85" />
-    </panel>
+         left="10"
+         name="notes_buttons_panel"
+         top_pad="5"
+         width="280"
+         auto_resize="false">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Teleport"
+             layout="topleft"
+             left="0"
+             name="teleport_btn"
+             top="0"
+             width="75" />
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Map"
+             layout="topleft"
+             name="show_on_map_btn"
+             top="0"
+             left_pad="5"
+             width="85" />
+        </panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index a62d2a5cdb..fce31a2c68 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -102,6 +102,7 @@
                  left="20"
                  name="nearby_view_sort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Residents list"
                  top="7"
                  width="18" />
             </panel>
@@ -195,6 +196,7 @@
                  left="20"
                  name="friends_viewsort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Friends list"
                  top="7"
                  width="18" />
                 <button
@@ -207,6 +209,7 @@
                  left_pad="5"
                  name="add_btn"
                  picture_style="true"
+                 tool_tip="Offer friendship to a resident"
                  top_delta="0"
                  width="18" />
                 <button
@@ -219,6 +222,7 @@
                  left_pad="180"
                  name="del_btn"
                  picture_style="true"
+                 tool_tip="Remove selected person from your Friends list"
                  top_delta="0"
                  width="18" />
             </panel>
@@ -262,6 +266,7 @@
                  left="20"
                  name="gear_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Groups list"
                  top="7"
                  width="18" />
                 <button
@@ -274,6 +279,7 @@
                  left_pad="5"
                  name="plus_btn"
                  picture_style="true"
+                 tool_tip="Join group/Create new group"
                  top_delta="0"
                  width="18" />
                 <button
@@ -287,6 +293,7 @@
                  left_pad="24"
                  name="activate_btn"
                  picture_style="true"
+                 tool_tip="Activate selected group"
                  top_delta="5"
                  width="10" />
                 <button
@@ -299,6 +306,7 @@
                  left_pad="146"
                  name="minus_btn"
                  picture_style="true"
+                 tool_tip="Leave selected group"
                  top_delta="-5"
                  width="18" />
             </panel>
@@ -341,6 +349,7 @@
                  left="20"
                  name="recent_viewsort_btn"
                  picture_style="true"
+                 tool_tip="Change sort and view of Residents list"
                  top="7"
                  width="18" />
             </panel>
@@ -372,6 +381,7 @@
              label="Profile"
              layout="topleft"
              name="view_profile_btn"
+             tool_tip="Show picture, groups, and other residents information"
              width="65" />
         </layout_panel>
         <layout_panel
@@ -391,6 +401,7 @@
              label="Add Friend"
              layout="topleft"
              name="add_friend_btn"
+             tool_tip="Add selected resident to your Friends List"
              width="85" />
         </layout_panel>
         <layout_panel
@@ -408,6 +419,7 @@
              label="Group Profile"
              layout="topleft"
              name="group_info_btn"
+             tool_tip="Show group information"
              width="80" />
         </layout_panel>
         <layout_panel
@@ -426,6 +438,7 @@
              label="Chat"
              layout="topleft"
              name="chat_btn"
+             tool_tip="Open chat session"
              width="45" />
         </layout_panel>
         <layout_panel
@@ -444,6 +457,7 @@
              label="IM"
              layout="topleft"
              name="im_btn"
+             tool_tip="Open instant message session"
              width="35" />
         </layout_panel>
         <layout_panel
@@ -482,6 +496,7 @@
              label="Teleport"
              layout="topleft"
              name="teleport_btn"
+             tool_tip="Offer teleport"
              width="65" />
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index b4d2bbb194..c8bde77a94 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="625"
+ height="480"
  layout="topleft"
  left="0"
  name="panel_pick_info"
@@ -16,29 +16,41 @@
      left="10"
      name="title"
      text_color="white"
-     top="5"
+     top="16"
      value="Pick Info"
      width="150" />
     <button
      follows="top|right"
-     height="20"
+     height="25"
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
      picture_style="true"
-     right="-20"
-     top="7"
-     width="20" />
+     right="-11"
+     top="16"
+     width="25" 
+     tab_stop="false" />
+  
+    <scroll_container
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="400"
+     layout="topleft"
+     left="0"
+     name="pick_info_scroll"
+     opaque="true"
+     reserve_scroll_corner="true"
+     width="265">
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
-     follows="left|right|top|bottom"
+     follows="left|right|top"
      height="550"
      layout="topleft"
      left="0"
-     min_height="300"
-     top="30"
-     width="265">
+     min_height="550"
+     top_pad="0"
+     width="263">
         <texture_picker
          enabled="false"
          follows="left|top|right"
@@ -110,7 +122,16 @@
          text_color="white"
          valign="center"
          value="[loading...]" />
+        <icon
+         follows="top|left"
+         height="15"
+         image_name=""
+         layout="topleft"
+         mouse_opaque="true"
+         name="maturity"
+         width="15" />
     </panel>
+    </scroll_container>
     <panel
      follows="left|right|bottom"
      height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 47cfd8e129..ff161cc2ab 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -8,92 +8,105 @@
  name="panel_picks"
  top="0"
  width="285">
-    <scroll_container
-     color="DkGray2"
-     follows="left|top|right|bottom"
-     height="350"
+    <layout_stack
+     name="layout"
+     orientation="vertical"
+     follows="all"
      layout="topleft"
-     left="2"
-     name="profile_scroll"
-     opaque="true"
+     left="0"
      top="0"
-     width="284">
-        <panel
-         height="115"
+     height="420"
+     width="284"
+     border_size="0">
+        <scroll_container
+         color="DkGray2"
+         follows="left|top|right|bottom"
+         height="350"
          layout="topleft"
-         left="0"
-         name="back_panel"
+         left="2"
+         name="profile_scroll"
+         opaque="true"
          top="0"
-         width="284" />
-    </scroll_container>
-    <panel
-     background_visible="true"
-     bevel_style="none"
-     enabled="false"
-     follows="left|right|bottom"
-     height="30"
-     label="bottom_panel"
-     layout="topleft"
-     name="edit_panel"
-     top_pad="5"
-     width="284">
-        <button
+         width="284">
+            <panel
+             height="115"
+             layout="topleft"
+             left="0"
+             name="back_panel"
+             top="0"
+             width="284" />
+        </scroll_container>
+        <panel
+         background_visible="true"
+         bevel_style="none"
          enabled="false"
-         follows="bottom|left"
-         font="SansSerifBigBold"
-         height="18"
-         image_selected="OptionsMenu_Press"
-         image_unselected="OptionsMenu_Off"
-         layout="topleft"
-         left="10"
-         name="gear_menu_btn"
-         picture_style="true"
-         top="5"
-         width="18" />
-        <button
-         follows="bottom|left"
-         font="SansSerifBigBold"
-         height="18"
-         image_disabled="AddItem_Off"
-         image_disabled_selected="AddItem_Press"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
+         auto_resize="false"
+         follows="bottom"
+         height="30"
+         label="bottom_panel"
          layout="topleft"
-         left="35"
-         name="new_btn"
-         picture_style="true"
-         tool_tip="Create New Pick at Current Location"
-         top="5"
-         width="18" />
-        <button
-         follows="bottom|right"
-         font="SansSerifBigBold"
-         height="18"
-         image_disabled="TrashItem_Off"
-         image_disabled_selected="TrashItem_Press"
-         image_selected="TrashItem_Press"
-         image_unselected="TrashItem_Off"
-         layout="topleft"
-         name="trash_btn"
-         picture_style="true"
-         right="-10"
-         top="5"
-         width="18" />
-    </panel>
-    <panel
-     follows="bottom|left"
-     height="30"
-     layout="topleft"
-     name="buttons_cucks"
-     width="284">
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Map"
+         name="edit_panel"
+         top_pad="5"
+         width="284">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifBigBold"
+             height="18"
+             image_selected="OptionsMenu_Press"
+             image_unselected="OptionsMenu_Off"
+             layout="topleft"
+             left="10"
+             name="gear_menu_btn"
+             picture_style="true"
+             top="5"
+             width="18" />
+            <button
+             follows="bottom|left"
+             font="SansSerifBigBold"
+             height="18"
+             image_disabled="AddItem_Off"
+             image_disabled_selected="AddItem_Press"
+             image_selected="AddItem_Press"
+             image_unselected="AddItem_Off"
+             layout="topleft"
+             left="35"
+             name="new_btn"
+             picture_style="true"
+             tool_tip="Create New Pick at Current Location"
+             top="5"
+             width="18" />
+            <button
+             follows="bottom|right"
+             font="SansSerifBigBold"
+             height="18"
+             image_disabled="TrashItem_Off"
+             image_disabled_selected="TrashItem_Press"
+             image_selected="TrashItem_Press"
+             image_unselected="TrashItem_Off"
+             layout="topleft"
+             name="trash_btn"
+             picture_style="true"
+             right="-10"
+             top="5"
+             width="18" />
+        </panel>
+        <panel
+         follows="bottom"
+         height="30"
+         auto_resize="false"
          layout="topleft"
-         name="show_on_map_btn"
-         width="85" />
-    </panel>
+         name="buttons_cucks"
+         width="284">
+            <button
+             enabled="false"
+             follows="bottom|left"
+             font="SansSerifSmallBold"
+             height="25"
+             label="Map"
+             layout="topleft"
+             name="show_on_map_btn"
+             width="85" />
+        </panel>
+    </layout_stack>
 </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 6d7cabc5c0..e710774232 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -40,33 +40,53 @@
      tab_stop="false"
      top="0"
      width="25" />
-    <tab_container
-     follows="left|top|right|bottom"
-     height="420"
-     layout="topleft"
-     left="10"
-     name="tabs"
-     tab_min_width="75"
-     tab_position="top"
-     top_pad="15"
-     width="285">
-        <panel
-         class="panel_profile"
-         filename="panel_profile.xml"
-         label="Profile"
-         layout="topleft"
-         name="panel_profile" />
-        <panel
-         class="panel_picks"
-         filename="panel_picks.xml"
-         label="Picks"
-         layout="topleft"
-         name="panel_picks" />
-        <panel
-         class="panel_notes"
-         filename="panel_notes.xml"
-         label="Notes &amp; Privacy"
+        <layout_stack
+         name="layout_stack"
+         orientation="vertical"
          layout="topleft"
-         name="panel_notes" />
-    </tab_container>
+         follows="all"
+         left="0"
+         top="50"
+         height="500"
+         width="305" 
+         border_size="0">
+            <panel
+             name="stack_panel"
+             follows="all"
+             layout="topleft"
+             top="0"
+             left="0"
+             height="500"
+             width="305">
+            <tab_container
+             follows="all"
+             height="500"
+             layout="topleft"
+             left="10"
+             name="tabs"
+             tab_min_width="75"
+             tab_position="top"
+             top="0"
+             width="280">
+                <panel
+                 class="panel_profile"
+                 filename="panel_profile.xml"
+                 label="Profile"
+                 layout="topleft"
+                 name="panel_profile" />
+                <panel
+                 class="panel_picks"
+                 filename="panel_picks.xml"
+                 label="Picks"
+                 layout="topleft"
+                 name="panel_picks" />
+                <panel
+                 class="panel_notes"
+                 filename="panel_notes.xml"
+                 label="Notes &amp; Privacy"
+                 layout="topleft"
+                 name="panel_notes" />
+            </tab_container>
+        </panel>
+    </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index 445c9cc288..4d91a544c3 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -15,6 +15,7 @@
      name="stand_btn"
      tool_tip="Click here to stand up."
      top="2"
+     visible="false"
      width="115" />
     <button
      follows="left|bottom"
@@ -24,5 +25,6 @@
      name="stop_fly_btn"
      tool_tip="Stop Flying"
      top="2"
+     visible="false"
      width="115" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3ad5cbe018..f597211ec9 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -197,52 +197,6 @@
      top_delta="-3"
      visible="false"
      width="16" />
-    <button
-     follows="right|bottom"
-     height="16"
-     image_disabled="sm_rounded_corners_simple.tga"
-     image_disabled_selected="sm_rounded_corners_simple.tga"
-     image_hover_selected="sm_rounded_corners_simple.tga"
-     image_hover_unselected="sm_rounded_corners_simple.tga"
-     image_selected="sm_rounded_corners_simple.tga"
-     image_unselected="sm_rounded_corners_simple.tga"
-     layout="topleft"
-     left_pad="313"
-     mouse_opaque="false"
-     name="menubar_search_bevel_bg"
-     picture_style="true"
-     top_delta="0"
-     width="94" />
-    <line_editor
-     bevel_style="none"
-     border_style="line"
-     commit_on_focus_lost="false"
-     follows="right|bottom"
-     height="11"
-     label="Search"
-     layout="topleft"
-     left_delta="1"
-     name="search_editor"
-     tab_group="1"
-     tool_tip="Search [SECOND_LIFE]"
-     top_delta="4"
-     width="78" />
-    <button
-     follows="right|bottom"
-     font="SansSerifSmall"
-     height="16"
-     image_disabled="status_search_btn.png"
-     image_disabled_selected="status_search_btn_pressed.png"
-     image_selected="status_search_btn_pressed.png"
-     image_unselected="status_search_btn.png"
-     layout="topleft"
-     left_delta="78"
-     name="search_btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Search [SECOND_LIFE]"
-     top_delta="-4"
-     width="16" />
     <text
      enabled="false"
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 3c49ce311a..3ac15fe550 100644
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
@@ -54,6 +54,7 @@
     name="close_btn" 
     mouse_opaque="true"
     label=""
+    tab_stop="false"
     image_unselected="toast_hide_btn.tga" 
     image_disabled="toast_hide_btn.tga"
     image_selected="toast_hide_btn.tga" 
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index f7d8cf948e..441caffa28 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -62,6 +62,7 @@
     mouse_opaque="true" 
     name="hide_btn" 
     label="" 
+    tab_stop="false"
     image_unselected="toast_hide_btn.tga" 
     image_disabled="toast_hide_btn.tga"
     image_selected="toast_hide_btn.tga" 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 655cf2b40f..df328118a2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -937,6 +937,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     <string name="tight skirt">tight skirt</string>	
 	<string name="wrinkles">wrinkles</string>	
 	
+    <!-- Favorites Bar -->
+    <string name="location_ctrl_add_landmark">Add to My Landmarks</string>
+    <string name="location_ctrl_edit_landmark">Edit My Landmark</string>
+    <string name="favorite_landmark_loading_tooltip">(Loading...)</string>
+	
 	<!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [SECOND_LIFE_VIEWER] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index b249451247..8f4d0edf95 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -9,6 +9,8 @@
 <location_input font="SansSerifSmall"
                 add_landmark_image_enabled="Favorite_Star_Active"
                 add_landmark_image_disabled="Favorite_Star_Off"
+                add_landmark_image_hover="Favorite_Star_Over"
+                add_landmark_image_selected="Favorite_Star_Press"
                 add_landmark_hpad="2"
                 allow_text_entry="true"
                 list_position="below"
-- 
cgit v1.2.3