merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3

* EXT-449 EXT-131 EXT-464
* People and Places panel layout changes
* Some I18N fixes, test language
* Updated group panels following proposed new design
* made ims easier to read by color coding

15 files changed, 432 insertions, 557 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 8bb67d0d4b..5aa7809208 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -162,13 +162,4 @@
      name="EnvAdvancedWaterButton"
      top_delta="0"
      width="137" />
-    <button
-     follows="left|top"
-     height="18"
-     label="?"
-     layout="topleft"
-     left="570"
-     name="EnvSettingsHelpButton"
-     top="22"
-     width="18" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 4d7fa45a47..61c98299a0 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -20,9 +20,7 @@
                 top="16"

                 left="2">

     <layout_panel

-      class="panel_im_control_panel"

       name="panel_im_control_panel"

-      filename="panel_im_control_panel.xml"

       layout="topleft"

       top_delta="-3"

       min_width="96" 

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 40847b28fe..1629727d56 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -93,7 +93,7 @@
              function="Edit.EnableCustomizeAvatar" />
         </menu_item_call>
         <menu_item_check
-         label="My Inventory"
+         label="My Things"
          layout="topleft"
          name="Inventory"
          shortcut="control|I">
@@ -138,7 +138,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="Exit Second Life"
+         label="Quit Second Life"
          layout="topleft"
          name="Quit"
          shortcut="control|Q">
@@ -173,15 +173,15 @@
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
-        <menu_item_call
+        <!--menu_item_call
          label="Chat"
          layout="topleft"
          name="Chat">
             <menu_item_call.on_click
              function="World.Chat" />
-        </menu_item_call>
+        </menu_item_call-->
         <menu_item_check
-         label="Nearby Chat"
+         label="Local Chat"
          layout="topleft"
          name="Nearby Chat"
          shortcut="control|H">
@@ -192,10 +192,8 @@
              function="Floater.Toggle"
              parameter="nearby_chat" />
         </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
         <menu_item_check
-         label="Active Speakers"
+         label="Nearby Speakers"
          layout="topleft"
          name="Active Speakers">
             <menu_item_check.on_check
@@ -270,7 +268,7 @@
         <menu_item_separator
          layout="topleft" />
         <menu_item_call
-         label="About Land"
+         label="Place Information"
          layout="topleft"
          name="About Land">
             <menu_item_call.on_click
@@ -353,8 +351,7 @@
             <menu_item_check.on_check
              function="Floater.Visible"
 			 parameter="mini_map" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
+            <menu_item_check.on_clickde
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_separator
@@ -370,7 +367,68 @@
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
-        <menu_item_check
+	<menu
+         create_jump_keys="true"
+         label="Sun Settings"
+         layout="topleft"
+         name="Environment Settings"
+         tear_off="true">
+            <menu_item_call
+             label="Sunrise"
+             layout="topleft"
+             name="Sunrise">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="sunrise" />
+            </menu_item_call>
+            <menu_item_call
+             label="Midday"
+             layout="topleft"
+             name="Noon"
+             shortcut="control|shift|Y">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="noon" />
+            </menu_item_call>
+            <menu_item_call
+             label="Sunset"
+             layout="topleft"
+             name="Sunset"
+             shortcut="control|shift|N">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="sunset" />
+            </menu_item_call>
+            <menu_item_call
+             label="Midnight"
+             layout="topleft"
+             name="Midnight">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="midnight" />
+            </menu_item_call>
+            <menu_item_call
+             label="Use region settings"
+             layout="topleft"
+             name="Revert to Region Default">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="default" />
+            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
+            <menu_item_call
+             label="Environment Editor"
+             layout="topleft"
+             name="Environment Editor">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="editor" />
+            </menu_item_call>
+        </menu>
+       <menu_item_separator
+         layout="topleft" />
+	<menu_item_check
          label="Build"
          layout="topleft"
          name="Build"
@@ -433,6 +491,8 @@
                  function="ShowFloater"
                  parameter="complaint reporter" />
             </menu_item_call>
+        <menu_item_separator
+             layout="topleft" />
         <menu_item_call
          label="About Second Life"
          layout="topleft"
@@ -1245,65 +1305,6 @@
          layout="topleft" />
         <menu
          create_jump_keys="true"
-         label="Environment Settings"
-         layout="topleft"
-         name="Environment Settings"
-         tear_off="true">
-            <menu_item_call
-             label="Sunrise"
-             layout="topleft"
-             name="Sunrise">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="sunrise" />
-            </menu_item_call>
-            <menu_item_call
-             label="Midday"
-             layout="topleft"
-             name="Noon"
-             shortcut="control|shift|Y">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="noon" />
-            </menu_item_call>
-            <menu_item_call
-             label="Sunset"
-             layout="topleft"
-             name="Sunset"
-             shortcut="control|shift|N">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="sunset" />
-            </menu_item_call>
-            <menu_item_call
-             label="Midnight"
-             layout="topleft"
-             name="Midnight">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="midnight" />
-            </menu_item_call>
-            <menu_item_call
-             label="Revert to Region Default"
-             layout="topleft"
-             name="Revert to Region Default">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="default" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Environment Editor"
-             layout="topleft"
-             name="Environment Editor">
-                <menu_item_call.on_click
-                 function="World.EnvSettings"
-                 parameter="editor" />
-            </menu_item_call>
-        </menu>
-        <menu
-         create_jump_keys="true"
          label="Performance Tools"
          layout="topleft"
          name="Performance Tools"
@@ -1824,7 +1825,7 @@
              function="Advanced.ShowDebugSettings"
              parameter="all" />
         </menu_item_call>
-        <menu_item_check
+	 <menu_item_check
          label="Debug (QA) Mode"
          layout="topleft"
          name="Debug Mode"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 17bb961308..8460e98fa3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -745,6 +745,7 @@ You need to enter both the First and Last name of your avatar.
 You need an account to enter [SECOND_LIFE]. Would you like to create one now?
     <url 
 	option="0"
+	name="url"
 	openexternally = "1">
 
 			http://secondlife.com/registration/
@@ -810,7 +811,7 @@ Delete pick [PICK]?
    name="PromptGoToEventsPage"
    type="alertmodal">
 Go to the [SECOND_LIFE] events web page?
-    <url option="0">
+    <url option="0" name="url">
 
 			http://secondlife.com/events/
     </url>
@@ -890,7 +891,7 @@ The new skin will appear after you restart [SECOND_LIFE].
    name="GoToAuctionPage"
    type="alertmodal">
 Go to the [SECOND_LIFE] web page to see auction details or make a bid?
-    <url option="0">
+    <url option="0" name="url">
 
 			http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]
     </url>
@@ -1205,7 +1206,7 @@ Please move all objects to be acquired onto the same region.
 [EXTRA]
 
 Go to [_URL] for information on purchasing currency?
-    <url option="0">
+    <url option="0" name="url">
 
 			http://secondlife.com/app/currency/
     </url>
@@ -2360,7 +2361,7 @@ Return to www.secondlife.com to create a new account?
 We&apos;re having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
 
 You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
-    <url option="1">
+    <url option="1" name="url">
 
 			http://secondlife.com/support/
     </url>	 
@@ -4958,7 +4959,7 @@ Automatically wear the clothing you create?
 You must be age-verified to visit this area.  Visit the Second Life website and verify your age?
 
 [_URL]
-    <url option="0">
+    <url option="0" name="url">
 
 	    https://secondlife.com/account/verification.php
     </url>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 91039539f9..5e2e2267f6 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -166,8 +166,8 @@
                  image_unselected="camera_presets/camera_presets_arrow_right.png"
                  image_disabled_selected="camera_presets/camera_presets_arrow_right.png" 
                  image_disabled="camera_presets/camera_presets_arrow_right.png"
+                 name="snapshot_settings"
                  tool_tip="Snapshot Settings" />
-                 />
                 <split_button.item
                  image_selected="camera_presets/camera_presets_snapshot.png"
                  image_unselected="camera_presets/camera_presets_snapshot.png"
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
new file mode 100644
index 0000000000..66a3a75cc4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="panel_im_control_panel"

+       width="96"

+       height="215"

+       border="false">

+  <avatar_list

+           width="90"

+           column_padding="0"

+           draw_heading="true"

+           draw_stripes="false"

+           follows="left|top|bottom|right"

+           layout="topleft"

+           left="3"

+           name="speakers_list"

+           search_column="1"

+           sort_column="2"

+           top="10"

+           height="150" />

+

+  <button name="group_info_btn"

+          label="Group Info"

+          left_delta="3"

+          width="90"

+		  height="20" />

+

+  <button name="call_btn"

+          label="Call"

+          width="90"

+          height="20" />

+

+</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 b9a384bf8f..454236f5ad 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="all"
- height="514"
+ height="500"
  label="General"
  class="panel_group_general"
  layout="topleft"
  left="1"
  name="general_tab"
- top="514"
+ top="500"
  width="280">
     <panel.string
      name="help_text">
@@ -40,105 +40,57 @@ Hover your mouse over the options for more help.
      name="help_button"
      top="8"
      width="20" /> -->
-    <line_editor
+    <name_box
      follows="left|top"
-     font="SansSerifSmall"
-     prevalidate_callback="asci"
-     halign="left"
      height="16"
-     label="Type your new group name here"
+     initial_value="(retrieving)"
      layout="topleft"
      left="10"
-     max_length="35"
-     name="group_name_editor"
-     top="8"
-     width="235" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="group_name"
-     top_delta="0"
-     width="240">
-        Type your new group name here
-    </text>
+     name="founder_name"
+     top_pad="10"
+     width="100" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left_delta="0"
+     left_pad="10"
      name="prepend_founded_by"
-     top_pad="4"
-     width="270">
-        Founded by:
+     top_delta="0"
+     width="140">
+        , Founder
     </text>
-    <name_box
-     follows="left|top"
-     height="16"
-     initial_value="(retrieving)"
-     layout="topleft"
-     left="30"
-     name="founder_name"
-     top_pad="0"
-     width="133" />
+    
     <text_editor
      type="string"
      length="1"
      follows="left|top"
-     halign="left"
-     height="125"
+     left="10"
+     height="75"
      hide_scrollbar="true"
      layout="topleft"
      max_length="511"
      name="charter"
-     right="275"
-     top_pad="0"
-     width="170"
+     top_pad="4"
+     width="260"
      word_wrap="true">
         Group Charter
     </text_editor>
-    <texture_picker
-     follows="left|top"
-     height="96"
-     label=""
-     layout="topleft"
-     left_delta="-95"
-     name="insignia"
-     tool_tip="Click to choose a picture"
-     top_delta="1"
-     width="85" />
-    <text
-      follows="left|top"
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     name="group_charter_label"
-     right="275"
-     top="190"
-     width="170">
-        Group Charter
-    </text>
-    <button
+    <!--<button
      follows="left|top"
-     height="22"
+     height="20"
      font="SansSerifSmall"
      label="Join (L$0)"
      label_selected="Join (L$0)"
      layout="topleft"
      left="10"
      name="join_button"
-     top="160"
+     top_pad="10"
      width="85" />
     <button
      follows="left|top"
-     height="22"
+     height="20"
      font="SansSerifSmall"
      label="Details"
      label_selected="Detailed View"
@@ -146,31 +98,20 @@ Hover your mouse over the options for more help.
      left_delta="0"
      name="info_button"
      top_delta="0"
-     width="85" />
+     width="85" /> -->
     <text
       follows="left|top"
      type="string"
      length="1"
-     font="SansSerif"
+     font="SansSerifBig"
+     tool_tip="Owners are shown in bold."
      height="16"
      layout="topleft"
      left_delta="0"
      name="text_owners_and_visible_members"
-     top_pad="30"
-     width="270">
-        Owners &amp; Visible Members
-    </text>
-    <text
-      follows="left|top"
-     type="string"
-     length="1"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="text_owners_are_shown_in_bold"
-     top_pad="0"
+     top_pad="10"
      width="270">
-        (Owners are shown in bold)
+        Members
     </text>
     <name_list
      column_padding="0"
@@ -186,48 +127,75 @@ Hover your mouse over the options for more help.
         <name_list.columns
          label="Member Name"
          name="name"
-         relative_width="0.45" />
+         relative_width="0.6" />
         <name_list.columns
          label="Title"
          name="title"
-         relative_width="0.3" />
-        <name_list.columns
-         label="Last Login"
-         name="online"
-         relative_width="0.25" />
-    </name_list>
+         relative_width="0.4" />
+      </name_list>
     <text
       follows="left|top"
       height="16"
      type="string"
      length="1"
      top_pad="10"
-     font="SansSerif"
+     font="SansSerifBig"
      layout="topleft"
      name="text_group_preferences">
         Group Preferences
     </text>
-    <panel
-     background_opaque="true"
-     bevel_style="in"
-     border="true"
-     follows="left|top"
-     height="125"
-     layout="topleft"
-     left_delta="0"
-     name="preferences_container"
-     top_pad="0"
-     width="263">
+         <text
+         follows="left|top"
+         type="string"
+         length="1"
+         height="16"
+         layout="topleft"
+         left_delta="0"
+         name="active_title_label"
+         top_pad="8"
+         width="240">
+            My Active Title
+        </text>
+        <combo_box
+         follows="left|top"
+         height="20"
+         layout="topleft"
+         left_delta="0"
+         name="active_title"
+         tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active."
+         top_pad="0"
+         width="240" />
         <check_box
          height="16"
-         initial_value="true"
-         label="Show in search"
+         font="SansSerifSmall"
+         label="Receive notices"
          layout="topleft"
-         left="4"
-         name="show_in_group_list"
-         tool_tip="Let people see this group in search results."
-         top="4"
-         width="90" />
+         left_delta="0"
+         name="receive_notices"
+         tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
+         top_pad="5"
+         width="240" />
+        <check_box
+         height="16"
+         label="Show in my profile"
+         layout="topleft"
+         left_delta="0"
+         name="list_groups_in_profile"
+         tool_tip="Sets whether you want to show this group in your Profile"
+         top_pad="5"
+         width="240" />
+        <panel
+         background_visible="true"
+         bevel_style="in"
+         border="true"
+         bg_alpha_color="FloaterUnfocusBorderColor"
+         follows="left|top"
+         height="125"
+         layout="topleft"
+         left_delta="0"
+         name="preferences_container"
+         top_pad="10"
+         width="263">
         <check_box
          follows="right|top"
          height="16"
@@ -235,12 +203,12 @@ Hover your mouse over the options for more help.
          layout="topleft"
          left_delta="0"
          name="open_enrollement"
-         tool_tip="Sets whether this group allows new members to join   without being invited."
+         tool_tip="Sets whether this group allows new members to join without being invited."
          top_pad="5"
          width="90" />
         <check_box
          height="16"
-         label="Enrollment fee: L$"
+         label="Enrollment fee:"
          layout="topleft"
          left_delta="0"
          name="check_enrollment_fee"
@@ -253,7 +221,8 @@ Hover your mouse over the options for more help.
          halign="left"
          height="16"
          increment="1"
-         label_width="10"
+         label_width="20"
+         label="L$"
          layout="topleft"
          left="25"
          max_val="99999"
@@ -261,53 +230,25 @@ Hover your mouse over the options for more help.
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
          top_delta="-2"
-         width="65" />
+         width="75" />
         <check_box
          height="16"
-         font="SansSerifSmall"
-         label="Receive notices"
-         layout="topleft"
-         left="5"
-         name="receive_notices"
-         tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you."
-         top_pad="5"
-         width="240" />
-        <check_box
-         height="16"
-         label="List in my profile"
-         layout="topleft"
-         left="5"
-         name="list_groups_in_profile"
-         tool_tip="Sets whether you want to list this group in your Profile"
-         top_pad="5"
-         width="240" />
-      <text
-         type="string"
-         length="1"
-         height="16"
+         initial_value="true"
+         label="Show in search"
          layout="topleft"
-         left="145"
-         name="active_title_label"
-         top="4"
-         width="95">
-            My Active Title
-        </text>
+         left="4"
+         name="show_in_group_list"
+         tool_tip="Let people see this group in search results."
+         top_pad="4"
+         width="90" />
         <combo_box
          height="20"
          layout="topleft"
          left_delta="0"
-         name="active_title"
-         tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active."
-         top_pad="0"
-         width="110" />
-      <combo_box
-         height="20"
-         layout="topleft"
-         left_delta="0"
          name="group_mature_check"
          tool_tip="Sets whether your group information is considered mature."
          top_pad="10"
-         width="120">
+         width="240">
             <combo_box.item
              label="Select Mature -"
              name="select_mature"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 2e5f2dcb0b..c4dc4fcea9 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -2,12 +2,12 @@
 <panel
  border="true"
  follows="all"
- height="530"
+ height="485"
  label="Notices"
  layout="topleft"
  left="1"
  name="notices_tab"
- top="530"
+ top="485"
  width="280">
     <panel.string
      name="help_text">
@@ -32,7 +32,7 @@ the General tab.
      name="help_button"
      top="8"
      width="20" /> -->
-     <text
+     <!--<text
       follows="left|top"
      type="string"
      length="1"
@@ -44,19 +44,19 @@ the General tab.
      top_pad="10"
      width="269">
         Group Notices Archive
-    </text>
+    </text> -->
     <text
       follows="left|top"
      type="string"
      length="1"
      word_wrap="true"
-     height="73"
+     height="40"
      layout="topleft"
-     left_delta="0"
+     left_delta="10"
      name="lbl2"
-     top_pad="4"
+     top_pad="10"
      width="270">
-        Notices are kept for 14 days. Click the notice below if you wish to view. Click the &apos;Refresh&apos; button to check if new notices have been received. Notice lists are limited to 200 notices per group on a daily basis.
+        Notices are kept for 14 days. Notice lists are limited to 200 notices per group on a daily basis.
     </text>
     <scroll_list
       follows="left|top"
@@ -127,7 +127,7 @@ the General tab.
      layout="topleft"
      left="0"
      name="panel_create_new_notice"
-     top="250"
+     top_pad="10"
      width="265">
         <text
          follows="left|top"
@@ -153,8 +153,8 @@ the General tab.
          left_delta="0"
          name="lbl2"
          top_pad="4"
-         width="196">
-            You must enter a subject to send a notice. You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can&apos;t send a folder.
+         width="195">
+            You can add a single item to a notice by dragging it from your inventory to this panel. Attached items must be copiable and transferrable, and you can&apos;t send a folder.
         </text>
         <text
          follows="left|top"
@@ -288,7 +288,7 @@ the General tab.
      layout="topleft"
      left="0"
      name="panel_view_past_notice"
-     top="250"
+     top="197"
      width="265">
         <text
          type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index e616389c36..016aa64927 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -2,100 +2,95 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="570"
- width="295"
- border="false"
+ height="420"
+ label="Notes &amp; Privacy"
  layout="topleft"
  left="0"
+ name="panel_notes"
  top="0"
- label="Notes &amp; Privacy"
- name="panel_notes">
+ width="285">
     <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="570"
-     width="265"
+     height="350"
      layout="topleft"
-     left="5"
-     top_pad="0"
- bevel_style="in"
-     opaque="true"
+     left="2"
      name="profile_scroll"
-     reserve_scroll_corner="false">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifBold"
-             height="16"
-             width="225"
-             left="0"
-             name="status_message"
-             text_color="white"
-             top="">
-               My private notes:
-            </text>
-            <text_editor
-             height="200"
-             follows="left|top"
-             width="243"
-             hide_scrollbar="true"
-             left="10"
-             max_length="1000"
-             name="notes_edit"
-             text_color="black"
-             top_pad="10"
-             word_wrap="true" />
-           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifBold"
-             height="16"
-             width="225"
-             left="10"
-             name="status_message2"
-             text_color="white"
-             top_pad="30">
-                Let this person:
-            </text>
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="See my online status"
-             left="20"
-             top_pad="10"
-             name="status_check" />
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="See me on the map"
-             left="20"
-             top_pad="10"
-             name="map_check"/>
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="Edit, delete or take my objects"
-             left="20"
-             top_pad="10"
-             name="objects_check" />
+     opaque="true"
+     top="0"
+     width="284">
+        <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="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" />
     </scroll_container>
     <panel
      follows="bottom|left"
      height="30"
-     width="280"
      layout="topleft"
      left="10"
+     name="notes_buttons_panel"
      top_pad="5"
-     name="notes_buttons_panel">
+     width="280">
         <button
+         enabled="false"
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
@@ -103,19 +98,18 @@
          layout="topleft"
          left="0"
          name="teleport_btn"
-         enabled="false"
          top="0"
          width="75" />
         <button
+         enabled="false"
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         label="Show on Map"
+         label="Map"
          layout="topleft"
-         left_pad="0"
          name="show_on_map_btn"
-         enabled="false"
          top="0"
-         width="105" />
+         left_pad="5"
+         width="85" />
     </panel>
 </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 1425246540..0075eef9ef 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -1,69 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- follows="left|top|right|bottom"
  bevel_style="in"
+ follows="left|top|right|bottom"
  height="625"
- width="280"
  layout="topleft"
  left="0"
  name="panel_pick_info"
- top="0">
+ top="0"
+ width="265">
     <text
-     type="string"
-     length="1"
      follows="top"
      font="SansSerifHugeBold"
      height="15"
      layout="topleft"
-     left="40"
+     left="0"
      name="title"
      text_color="white"
      top="0"
-     width="150">
-        Pick Info
-    </text>
-   <button
+     value="Pick Info"
+     width="150" />
+    <button
      follows="top|right"
-     right="-25"
-     top="10"
-     width="20"
      height="20"
      image_overlay="BackArrow_Off"
      layout="topleft"
      name="back_btn"
-     picture_style="true" />
+     picture_style="true"
+     right="-25"
+     top="10"
+     width="20" />
     <panel
-     follows="left|right|top|bottom"
-     min_height="300"
-     width="280"
-     layout="topleft"
      background_visible="true"
      bg_alpha_color="DkGray2"
-     left="10"
-     top="30">
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="0"
+     min_height="300"
+     top="30"
+     width="265">
         <texture_picker
          enabled="false"
          follows="left|top|right"
-         height="150"
+         height="300"
          layout="topleft"
          left="10"
          name="pick_snapshot"
-         right="-10"
-         top="10" />
+         top="10"
+         width="260" />
         <text
-         type="string"
-         length="1"
          follows="left|top"
+         font="SansSerifBigBold"
          height="15"
          layout="topleft"
          left="10"
          name="Name:"
-         text_color="white">
-            Name:
-        </text>
+         text_color="white"
+         value="Name:" />
         <text
-         type="string"
-         length="1"
          follows="left|top|right"
          height="15"
          layout="topleft"
@@ -71,25 +64,20 @@
          name="pick_name"
          right="-10"
          text_color="white"
-         word_wrap="true">
-            [name]
-        </text>
+         value="[name]"
+         word_wrap="true" />
         <text
-         type="string"
          follows="left|top"
+         font="SansSerifBigBold"
          height="15"
          layout="topleft"
          left="10"
          name="description_label"
          text_color="white"
          top_pad="20"
-         v_pad="0"
-         valign="center">
-            Description:
-        </text>
+         valign="center"
+         value="Description:" />
         <text
-         type="string"
-         length="1"
          follows="left|top|right"
          height="60"
          layout="topleft"
@@ -98,42 +86,38 @@
          right="-10"
          text_color="white"
          valign="center"
-         word_wrap="true">
-            [description]
-        </text>
+         value="[description]"
+         width="260"
+         word_wrap="true" />
         <text
-         type="string"
-         length="1"
          follows="left|top"
+         font="SansSerifBigBold"
          height="20"
          layout="topleft"
          left="10"
          name="location_label"
          text_color="white"
          top_pad="20"
-         valign="bottom">
-            Location:
-        </text>
+         valign="bottom"
+         value="Location:" />
         <text
-         type="string"
          follows="left|top"
          height="30"
          layout="topleft"
          left="10"
          name="pick_location"
          text_color="white"
-         valign="center">
-            [loading...]
-        </text>
+         valign="center"
+         value="[loading...]" />
     </panel>
     <panel
+     bottom="660"
      follows="left|right|bottom"
      height="30"
      layout="topleft"
      left="8"
      name="buttons"
-     right="-10"
-     bottom="660">
+     right="-10">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -150,7 +134,6 @@
          height="25"
          label="Teleport"
          layout="topleft"
-         left_pad="0"
          name="teleport_btn"
          top="0"
          width="80" />
@@ -160,20 +143,8 @@
          height="25"
          label="Show on Map"
          layout="topleft"
-         left_pad="0"
          name="show_on_map_btn"
          top="0"
          width="100" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Verb"
-         layout="topleft"
-         left_pad="0"
-         name="verb_btn"
-         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
index 78bec6035f..0bfdb12806 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="false"
+ bevel_style="none"
  follows="top|left|right|bottom"
- top="0"
+ height="120"
+ layout="topleft"
  left="0"
- height="100"
-     width="265"
- name="picture_item">
+ name="picture_item"
+ top="0"
+ width="275">
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
      enabled="false"
      follows="left|top"
-     height="100"
-     width="100"
+     height="120"
      layout="topleft"
-     left="10"
-     bottom_pad="10"
+     left="5"
      mouse_opaque="false"
      name="picture"
      tab_stop="false"
-     top="10" />
+     top="5"
+     width="120" />
     <text
      follows="top|left|right"
-     font="SansSerifTiny"
      height="16"
      layout="topleft"
-     left="120"
+     left="135"
      name="picture_name"
-     top="10"
      text_color="white"
+     top="5"
      use_ellipses="true"
-     width="120" />
+     width="120"
+     word_wrap="true" />
     <text
      follows="top|left|right"
-     font="SansSerifTiny"
-     height="60"
-     width="140"
-     top_pad="0"
+     height="75"
      layout="topleft"
+     left="135"
      name="picture_descr"
+     top_pad="10"
      use_ellipses="true"
+     width="130"
      word_wrap="true" />
     <button
      follows="top|right"
      height="16"
-     image_selected="Info"
-     image_unselected="Info"
+     image_selected="Info_Press"
+     image_unselected="Info_Off"
      layout="topleft"
      name="info_chevron"
      picture_style="true"
+     right="262"
      tab_stop="false"
-     top="6"
-     left="233"
+     top="3"
      width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 2be9f900da..47cfd8e129 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,53 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- bevel_style="in"
  follows="left|top|right|bottom"
- height="570"
- width="295"
- border="false"
+ height="420"
+ label="Picks"
  layout="topleft"
  left="0"
+ name="panel_picks"
  top="0"
- label="Picks"
- name="panel_picks">
+ width="285">
     <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="570"
-     width="265"
+     height="350"
      layout="topleft"
-     left="5"
-     top_pad="0"
- bevel_style="in"
-     opaque="true"
+     left="2"
      name="profile_scroll"
-     reserve_scroll_corner="false">
-<!-- below is a special title shown for the Agent on the "Picks" tab
-    <text
-     type="string"
-     length="1"
-     follows="top"
-     font="SansSerifBold"
-     height="35"
-     width="250"
-     layout="topleft"
-     left="10"
-     name="pick_title_agent"
-     text_color="white"
-     top_pad="25"
-     visible="false"
-     word_wrap="true">
-        Tell everyone about your favorite Second Life places...
-    </text>-->
+     opaque="true"
+     top="0"
+     width="284">
         <panel
          height="115"
-     width="265"
          layout="topleft"
          left="0"
          name="back_panel"
-         top="0" />
+         top="0"
+         width="284" />
     </scroll_container>
-   <panel
+    <panel
      background_visible="true"
      bevel_style="none"
      enabled="false"
@@ -55,17 +34,14 @@
      height="30"
      label="bottom_panel"
      layout="topleft"
-     left="0"
      name="edit_panel"
-     visible="false"
-     top_pad="0"
-     width="280">
+     top_pad="5"
+     width="284">
         <button
          enabled="false"
          follows="bottom|left"
          font="SansSerifBigBold"
          height="18"
-         hover_glow_amount="0.15"
          image_selected="OptionsMenu_Press"
          image_unselected="OptionsMenu_Off"
          layout="topleft"
@@ -80,7 +56,6 @@
          height="18"
          image_disabled="AddItem_Off"
          image_disabled_selected="AddItem_Press"
-         hover_glow_amount="0.15"
          image_selected="AddItem_Press"
          image_unselected="AddItem_Off"
          layout="topleft"
@@ -96,7 +71,6 @@
          height="18"
          image_disabled="TrashItem_Off"
          image_disabled_selected="TrashItem_Press"
-         hover_glow_amount="0.15"
          image_selected="TrashItem_Press"
          image_unselected="TrashItem_Off"
          layout="topleft"
@@ -109,32 +83,17 @@
     <panel
      follows="bottom|left"
      height="30"
-     width="280"
      layout="topleft"
-     left="10"
-     top_pad="5"
-     name="buttons_cucks">
+     name="buttons_cucks"
+     width="284">
         <button
-         follows="bottom|left"
-         font="SansSerifSmallBold"
-         height="25"
-         label="Teleport"
-         layout="topleft"
-         left="0"
-         name="teleport_btn"
          enabled="false"
-         top="0"
-         width="75" />
-        <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         label="Show on Map"
+         label="Map"
          layout="topleft"
-         left_pad="0"
          name="show_on_map_btn"
-         enabled="false"
-         top="0"
-         width="105" />
+         width="85" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 1a88cc55ec..73cd988103 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -19,37 +19,36 @@
      background_image="TextField_Search_Off"
      follows="left|top|right"
      font="SansSerif"
-     height="20"
+     height="23"
      label="Filter"
      layout="topleft"
      left="15"
      name="Filter"
      text_color="black"
-     text_pad_left="23"
+     text_pad_left="26"
      top="3"
-     width="270" />
+     width="256" />
     <button
      follows="left|top|right"
-     font="SansSerifBigBold"
      height="13"
      image_selected="Search"
      image_unselected="Search"
      layout="topleft"
-     left="23"
+     left="20"
      name="landmark_search"
      picture_style="true"
      scale_image="false"
-     top="5"
+     top="8"
      width="13" />
     <tab_container
-     follows="all"
+     follows="left|top|right|bottom"
      height="326"
      layout="topleft"
-     left="10"
+     left="9"
      name="Places Tabs"
      tab_position="top"
-     top_pad="19"
-     width="280" />
+     top_pad="15"
+     width="285" />
     <button
      follows="bottom|left"
      font="SansSerifSmallBold"
@@ -73,9 +72,10 @@
      image_unselected="widgets/ComboButton_Off.png"
      label="▼"
      layout="topleft"
-     left_pad="0"
+     top_pad="0"
      name="folder_menu_btn"
      visible="false"
+     left_pad="5"
      width="20" />
     <button
      follows="bottom|left"
@@ -84,40 +84,28 @@
      label="Teleport"
      layout="topleft"
      left="10"
+     top_pad="0"
      name="teleport_btn"
-     top_delta="0"
      width="80" />
     <button
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
-     label="Show on Map"
+     label="Map"
      layout="topleft"
-     left_pad="0"
      name="map_btn"
-     top_delta="0"
-     width="110" />
+     left_pad="5"
+     width="80" />
     <button
      enabled="false"
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
+     left_pad="5"
      label="Share"
      layout="topleft"
-     left_pad="0"
      name="share_btn"
-     top_delta="0"
      width="60" />
-    <button
-     follows="bottom|right"
-     font="SansSerifSmallBold"
-     height="25"
-     label="▼"
-     layout="topleft"
-     left_pad="0"
-     name="overflow_btn"
-     top_delta="0"
-     width="30" />
     <panel
      class="panel_place_info"
      filename="panel_place_info.xml"
@@ -125,6 +113,5 @@
      layout="topleft"
      left="0"
      name="panel_place_info"
-     top="-200"
      visible="false" />
 </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 a14d8bbc6b..6d7cabc5c0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- follows="left|top|right|bottom"
-  width="305"
-  height="650"
- label="Profile"
- bevel_style="in"
+ follows="all"
+ height="550"
  layout="topleft"
- left="0"
+ min_height="350"
+ min_width="240"
  name="panel_target_profile"
- top="0">
+ width="305">
     <text
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="20"
      layout="topleft"
-     top="0"
      left="10"
-     width="250"
-     height="20"
-     font="SansSerifHugeBold"
+     name="user_name"
      text_color="white"
-     follows="top|left|right"
-     mouse_opaque="true"
-     name="user_name">(Loading...)</text>
+     top="0"
+     value="(Loading...)"
+     width="250" />
     <text
-     layout="topleft"
-     width="100"
+     follows="top|left"
      height="16"
+     layout="topleft"
      left="10"
-     top_pad="5"
-     font="SansSerifTiny"
+     name="status"
      text_color="LtGray_50"
-     follows="top|left"
-     mouse_opaque="true"
-     name="status">Online</text>
+     top_pad="5"
+     value="Online"
+     width="100" />
     <button
+     follows="top|right"
+     height="25"
+     image_overlay="BackArrow_Off"
      layout="topleft"
      name="back"
+     picture_style="true"
      right="-10"
-     top="0"
-     width="25"
-     height="25"
-     label=""
      tab_stop="false"
-     follows="top|right"
-     image_selected=""
-     image_unselected=""
-     image_overlay="BackArrow_Off" />
+     top="0"
+     width="25" />
     <tab_container
      follows="left|top|right|bottom"
-     height="550"
-     width="306"
-     tab_min_width="75"
+     height="420"
      layout="topleft"
      left="10"
      name="tabs"
+     tab_min_width="75"
      tab_position="top"
-     top_pad="20">
+     top_pad="15"
+     width="285">
         <panel
          class="panel_profile"
          filename="panel_profile.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 4ae90380f8..fa455dffb0 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="sidetray_tab_panel"
-       bottom="0" height="25" left="0" background_visible="false"
-       bg_visible="false" border="false" border_visible="false"
-       bg_opaque_color="0.7 0.3 0.7 1.0"
-       follows="left|top|right"
-       mouse_opaque="true">
-    <text type="string" length="1" bg_visible="false" border_visible="false"
-               bottom="0" enabled="true" follows="left|top"
-               height="20" left="10"
-               font="SansSerifBold" halign="left"
-               name="sidetray_tab_title" width="100">
-        Side Panel
-    </text>
+<panel
+ background_visible="true"
+ bottom="0"
+ follows="left|top|right"
+ height="20"
+ layout="topleft"
+ left="0"
+ name="sidetray_tab_panel">
+    <text
+     follows="left|top"
+     font="SansSerifHuge"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="sidetray_tab_title"
+     text_color="white"
+     top="4"
+     value="Side Panel"
+     width="255" />
 </panel>