merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0

Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show

13 files changed, 344 insertions, 378 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 04d4362130..84d54f9673 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -18,15 +18,6 @@
              function="Floater.Show"
              parameter="preferences" />
         </menu_item_call>
-		<menu_item_call
-         label="Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|A">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
-        </menu_item_call>
         <menu_item_separator
          layout="topleft" />
         <menu
@@ -225,6 +216,17 @@
         </menu_item_check>
         <menu_item_separator
          layout="topleft" />
+		<menu_item_call
+         label="Media Remote Ctrl"
+         layout="topleft"
+         name="Preferences"
+         shortcut="control|alt|M">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="media_remote_ctrl" />
+        </menu_item_call>
+        <menu_item_separator
+         layout="topleft" />
         <menu_item_check
          label="Active Speakers"
          layout="topleft"
@@ -362,7 +364,7 @@
              function="Floater.Visible"
 			 parameter="mini_map" />
             <menu_item_check.on_click
-             function="Floater.Show"
+             function="Floater.Toggle"
              parameter="mini_map" />
         </menu_item_check>
         <menu_item_separator
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 680226f44f..f8bb15dc24 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3063,6 +3063,17 @@ Are you sure you want to teleport?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="TeleportToPick"
+   type="alertmodal">
+Teleport to [PICK]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
    icon="alert.tga"
    label="Message everyone in your Estate"
    name="MessageEstate"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 539b656f34..fe23d58793 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,56 +1,274 @@
-<?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">
-	<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">
-	
-		<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="true" width="250" height="28" min_height="28">
-		<line_editor name="chat_box"  follows="left|right" 
-			width="250" height="20" left="0" bottom="6" 
-			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" 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="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" 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"/>
-	  </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"/>
-	  <panel follows="left|right" auto_resize="false" width="40" height="28" min_height="28">
-		<chiclet_notification name="im_well" follows="left|right" auto_resize="false"
-			left="0" bottom="4" width="40" height="25" 
-			image_unselected="im_notifications.tga" image_selected="im_notifications.tga">
-			<chiclet_notification.commit_callback
-				function="Notification.Show"
-				parameter="ClickUnimplemented" />
-		</chiclet_notification>
-	  </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 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="bottom_tray_sys_notifications.tga" image_selected="bottom_tray_sys_notifications.tga">
-			<chiclet_notification.commit_callback
-				function="Notification.Show"
-				parameter="ClickUnimplemented" />
-		</chiclet_notification>
-	  </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>	
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bg_alpha_color="0.25 0.25 0.25 1"
+ bg_opaque_color="0.25 0.25 0.25 1"
+ follows="left|bottom|right"
+ height="28"
+ layout="topleft"
+ left="0"
+ name="bottom_tray"
+ top="28"
+ border_visible="true"
+ width="1000">
+    <panel.string
+     name="gesture_label">
+        Gestures
+    </panel.string>
+    <layout_stack
+     border_size="0"
+     follows="left|right|bottom|top"
+     height="28"
+     layout="topleft"
+     left="0"
+     name="toolbar_stack"
+     orientation="horizontal"
+     top="0"
+     width="1000">
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         left="5"
+         min_height="28"
+         width="250"
+         top="0"
+         min_width="100">
+            <line_editor
+             border_style="line"
+             border_thickness="1"
+             follows="left|right"
+             height="20"
+             layout="topleft"
+             left="0"
+             name="chat_box"
+             top="3"
+             width="250" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5"
+         min_width="5" />
+        <view_border
+         auto_resize="false"
+         bevel_style="in"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         left="270"
+         top="0"
+         width="1" />
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="100"
+         top="0"
+         min_width="100">
+            <chiclet_talk
+             follows="right"
+             height="20"
+             layout="topleft"
+             left="0"
+             name="talk"
+             top="3"
+             width="100" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5" 
+         min_width="5"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="90"
+         top="0"
+         min_width="90">
+            <combo_box
+             bottom="22"
+             follows="right"
+             height="20"
+             label="Gestures"
+             layout="topleft"
+             name="Gesture"
+             top="3"
+             width="90" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="chiclet_list_panel"
+         width="250"
+         min_width="100">
+            <chiclet_panel
+             follows="left|right"
+             height="25"
+             layout="topleft"
+             left="0"
+             name="chiclet_list"
+             top="1"
+             width="250" />
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         name="im_well_panel"
+         width="40"
+         top="0"
+         min_width="40" >
+            <chiclet_notification
+             follows="right"
+             height="25"
+             image_selected="im_notifications.tga"
+             image_unselected="im_notifications.tga"
+             layout="topleft"
+             left="0"
+             name="im_well"
+             top="1"
+             width="40" >
+			  <chiclet_notification.commit_callback
+				 function="Notification.Show"
+				 parameter="ClickUnimplemented" />
+			</chiclet_notification>
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="10" 
+         min_width="10"/>
+        <view_border
+         auto_resize="false"
+         bevel_style="in"
+         follows="left|right"
+         height="30"
+         layout="topleft"
+         left="270"
+         name="well_separator"
+         top="0"
+         width="1" />
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="10" 
+         min_width="10" />
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         top="0"
+         name="sys_well_panel"
+         width="48"
+         min_width="48">
+            <chiclet_notification
+             follows="right"
+             height="25"
+             image_selected="bottom_tray_sys_notifications.tga"
+             image_unselected="bottom_tray_sys_notifications.tga"
+             layout="topleft"
+             left="0"
+             name="sys_well"
+             top="1"
+             width="48" >
+			  <chiclet_notification.commit_callback
+				 function="Notification.Show"
+				 parameter="ClickUnimplemented" />
+			</chiclet_notification>
+        </layout_panel>
+        <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         top="0"
+         width="5" 
+         min_width="5" />
+    </layout_stack>
 </panel>
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 acbbde37c9..79833ea20b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -67,7 +67,8 @@
          height="16"
          layout="topleft"
          left="10"
-         name="Name:">
+         name="Name:"
+         text_color="white">
             Name:
         </text>
         <line_editor
@@ -78,6 +79,7 @@
          left="10"
          name="pick_name"
          right="-10"
+         text_color="black"
          width="290" />
         <text
          type="string"
@@ -87,6 +89,7 @@
          layout="topleft"
          left="10"
          name="description_label"
+         text_color="white"
          v_pad="15"
          valign="center">
             Description:
@@ -94,10 +97,12 @@
         <text_editor
          follows="left|top|right"
          height="100"
+         hide_scrollbar="true"
          layout="topleft"
          left="10"
          max_length="1023"
          name="pick_desc"
+         text_color="black"
          right="-10"
          word_wrap="true" />
         <text
@@ -108,6 +113,7 @@
          layout="topleft"
          left="10"
          name="description_label"
+         text_color="white"
          v_pad="15"
          valign="bottom">
             Location:
@@ -121,6 +127,7 @@
          left="10"
          name="pick_location"
          right="-10"
+         text_color="black"
          v_pad="10"
          valign="center"
          word_wrap="true">
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 5f51e8d22c..38049c896e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -220,11 +220,13 @@
       </line_editor>
       <check_box
        follows="left|top"
+       font="SansSerifBold"
        label="Show me in Search results" 
        layout="topleft"
        left="9"
        name="show_in_search_checkbox"
        height="16"
+       text_enabled_color="white"
        top_pad="10" 
        width="250"/>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
deleted file mode 100644
index 7cdda126b9..0000000000
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 1"
- height="560"
- label="Landmark"
- layout="topleft"
- left="0"
- name="landmark_info"
- top="800"
- width="355">
-    <panel.string
-     name="not_available">
-        (N\A)
-    </panel.string>
-    <panel.string
-     name="unknown">
-        (unknown)
-    </panel.string>
-    <panel.string
-     name="public">
-        (public)
-    </panel.string>
-    <panel.string
-     name="server_update_text">
-        Place information not available without server update.
-    </panel.string>
-    <panel.string
-     name="server_error_text">
-        Information about this location is unavailable at this time, please try again later.
-    </panel.string>
-    <panel.string
-     name="server_forbidden_text">
-        Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
-    </panel.string>
-    <panel.string
-     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>
-    <scroll_container
-     follows="all"
-     height="560"
-     layout="topleft"
-     left="0"
-     top="0"
-     width="355">
-        <panel
-         height="560"
-         layout="topleft"
-         left="0"
-         name="scrolling_panel"
-         top="0"
-         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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e2597b4700..63082d3150 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -428,6 +428,9 @@
   <string name="no_friends">
     No friends
   </string>
+  <string name="no_groups">
+    No groups
+  </string>
   <panel 
 	layout="topleft"
 	name="panel_profile_view" 
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 9fc1627cb9..576654b860 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -57,34 +57,36 @@
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="15"
          layout="topleft"
          left="10"
-         name="Name:">
+         name="Name:"
+         text_color="white">
             Name:
         </text>
         <text
          type="string"
          length="1"
          follows="left|top|right"
-         height="20"
+         height="15"
          layout="topleft"
          left="10"
          name="pick_name"
          right="-10"
-         text_color="white"
+         text_color="black"
          word_wrap="true">
             [name]
         </text>
         <text
          type="string"
-         length="1"
          follows="left|top"
-         height="20"
+         height="15"
          layout="topleft"
          left="10"
          name="description_label"
-         v_pad="15"
+         text_color="white"
+         top_pad="20"
+         v_pad="0"
          valign="center">
             Description:
         </text>
@@ -92,13 +94,12 @@
          type="string"
          length="1"
          follows="left|top|right"
-         height="40"
+         height="60"
          layout="topleft"
          left="10"
          name="pick_desc"
          right="-10"
-         text_color="white"
-         v_pad="15"
+         text_color="black"
          valign="center"
          word_wrap="true">
             [description]
@@ -111,20 +112,19 @@
          layout="topleft"
          left="10"
          name="description_label"
-         v_pad="15"
+         text_color="white"
+         top_pad="20"
          valign="bottom">
             Location:
         </text>
         <text
          type="string"
-         length="1"
          follows="left|top"
          height="30"
          layout="topleft"
          left="10"
          name="pick_location"
-         text_color="white"
-         v_pad="15"
+         text_color="black"
          valign="center">
             [loading...]
         </text>
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 a4599bdf1e..6a819d0ef4 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
@@ -42,6 +42,7 @@
      name="picture_descr"
      text_color="white"
      top="25"
+     use_ellipses="true"
      width="170"
      word_wrap="true" />
     <button
@@ -53,7 +54,7 @@
      image_selected="navbar_bg_button.tga"
      image_unselected="navbar_bg_button.tga"
      layout="topleft"
-     name="inspector"
+     name="info_chevron"
      picture_style="true"
      right="-5"
      tab_stop="false"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index ed851452fe..c8a814887a 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -93,8 +93,6 @@
          follows="bottom|left"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="plus.tga"
-         image_disabled_selected="plus.tga"
          image_hover_selected="plus.tga"
          image_selected="plus.tga"
          image_unselected="plus.tga"
@@ -109,8 +107,6 @@
          follows="bottom|right"
          font="SansSerifBigBold"
          height="16"
-         image_disabled="minus.tga"
-         image_disabled_selected="minus.tga"
          image_hover_selected="minus.tga"
          image_selected="minus.tga"
          image_unselected="minus.tga"
@@ -169,7 +165,7 @@
          height="25"
          label="Verb"
          layout="topleft"
-         left="280"
+         right="-15"
          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 272a7f4328..2aa566543f 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -31,13 +31,13 @@
      top_pad="19"
      width="335" />
     <panel
-     class="panel_landmark_info"
-     filename="panel_landmark_info.xml"
+     class="panel_place_info"
+     filename="panel_place_info.xml"
      follows="left|top|right|bottom"
      height="675"
      layout="topleft"
      left="0"
-     name="panel_landmark_info"
+     name="panel_place_info"
      top="-310"
      visible="false"
      width="355" />
@@ -73,7 +73,7 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="false"
+     enabled="true"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
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 428d071db2..9e95411929 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -38,7 +38,7 @@
      height="625"
      layout="topleft"
      left="0"
-     name="profile_tabs"
+     name="tabs"
      tab_position="top"
      top="35"
      width="355">
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 5ede1c2e9e..4f6f53e5b4 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -7,14 +7,14 @@
   collapsed="true"
 >
   <sidetray_tab 	
-    name="sidebarpanel2" 
+    name="sidebar_people"
+    tab_title="People"
+    description="Find your friends, contacts and people nearby."
+    image="icn_voice-groupfocus.tga"
     mouse_opaque="false" 
     background_opaque="false" 
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-groupfocus.tga"
-    tab_title="People"
-    description="Find your friends, contacts and people nearby."
   >
     <collapsible_ctrl 
       name="people_accordion" 
@@ -36,16 +36,16 @@
       />
     </collapsible_ctrl>
   </sidetray_tab>
-  
+  <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
-    name="sidebarpanel1" 
+    name="sidebar_places"
+    tab_title="Places"
+    label="Places"
+    description="Find places to go and places you've been."
+    image="inv_item_landmark.tga" 
     mouse_opaque="false" 
     background_visible="true" 
-    label="Places" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="inv_item_landmark.tga" 
-    tab_title="Places" 
-    description="Find places to go and places you've been."
   >
     <collapsible_ctrl 
       name="places_accordian" 
@@ -67,12 +67,12 @@
   
   <sidetray_tab 
     name="sidebar_me"
+    tab_title="Me"
+    description="Change your profile, your look and quick links to your outfits."
+    image="icn_voice-pvtfocus.tga"
     mouse_opaque="false" 
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
-    image="icn_voice-pvtfocus.tga"
-    tab_title="Me"
-    description="Change your profile, your look and quick links to your outfits."
   >
     <collapsible_ctrl 
       name="me_accordion"