merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3

* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions

16 files changed, 270 insertions, 28 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0bd5f114ed..e32ea0944e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -93,6 +93,7 @@
   <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false"/>
 
   <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" />
+  <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" />
 
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index bb5a4e51f7..6ef1eb9513 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -15,4 +15,8 @@
   <menu_item_call name="organize_offline" label="Organize Offline Friends">
     <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 8c2c5e8c9e..2b0f029016 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -15,4 +15,8 @@
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="view_icons" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index 00cf443cc6..88b0528e53 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -12,4 +12,8 @@
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..5c8a8ee208
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="305"
+ layout="topleft"
+ name="block_list_panel"
+ min_height="350"
+ min_width="240"
+ width="280">
+    <text 
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="20"
+     layout="topleft"
+     left="10" 
+     name="title_text"
+     text_color="white"
+     top="0" 
+     width="250">
+        Blocked List
+     </text>
+     <button 
+     follows="top|right"
+     height="25"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back"
+     right="-9"
+     tab_stop="false" 
+     top="0"
+     width="25"/>
+    <scroll_list
+     follows="left|top|right|bottom"
+     height="200"
+     layout="topleft"
+     left="5"
+     name="blocked"
+     tool_tip="List of currently blocked residents"
+     top="30"
+     width="270" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block Resident..."
+     label_selected="Block Resident..."
+     layout="topleft"
+     left_delta="0"
+     name="Block resident..."
+     tool_tip="Pick a resident to block"
+     top_pad="4"
+     width="210">
+        <button.commit_callback
+         function="Block.ClickPick" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block object by name..."
+     label_selected="Block object by name..."
+     layout="topleft"
+     left_delta="0"
+     name="Block object by name..."
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickBlockByName" />
+    </button>
+    <button
+     enabled="false"
+     follows="left|bottom"
+     height="20"
+     label="Unblock"
+     label_selected="Unblock"
+     layout="topleft"
+     left_delta="0"
+     name="Unblock"
+     tool_tip="Remove resident or object from blocked list"
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickRemove" />
+    </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 8fc029bea6..79ca839f28 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -266,7 +266,7 @@
              top="2"
              width="48">
               <button
-               image_selected="bottom_tray_sys_notifications.tga"
+               image_selected="bottom_tray_sys_notifications_selected.tga"
                image_unselected="bottom_tray_sys_notifications.tga"/>
               <unread_notifications
                width="20"
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 fa02cdb4b2..0d6d8ba97d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -13,10 +13,44 @@
  top="10"
  width="255">
    <string
+    name="CaptionTextAcctInfo">
+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+   </string>
+   <string
+    name="AcctTypeResident"
+    value="Resident" />
+   <string
+    name="AcctTypeTrial"
+    value="Trial" />
+   <string
+    name="AcctTypeCharterMember"
+    value="Charter Member" />
+   <string
+    name="AcctTypeEmployee"
+    value="Linden Lab Employee" />
+   <string
+    name="PaymentInfoUsed"
+    value="Payment Info Used" />
+   <string
+    name="PaymentInfoOnFile"
+    value="Payment Info On File" />
+   <string
+    name="NoPaymentInfoOnFile"
+    value="No Payment Info On File" />
+   <string
+    name="AgeVerified"
+    value="Age-verified" />
+   <string
+    name="NotAgeVerified"
+    value="Not Age-verified" />
+   <string
     name="partner_edit_link_url">
        http://www.secondlife.com/account/partners.php?lang=en
    </string>
-   <scroll_container
+   <string
+    name="no_partner_text"
+    value="None" />
+  <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
      height="300"
@@ -38,7 +72,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      follows="left|top|right|bottom"  
-     height="620"
+     height="750"
      layout="topleft"
      left="0"
      name="data_panel" 
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 8ebf1b69a7..f97daf922f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0"
-	height="200" label="instant_message" layout="topleft" left="0"
+	height="155" label="instant_message" layout="topleft" left="0"
 	name="panel_group_notify" top="0" width="350">
-	<panel background_visible="true" bevel_style="in" bg_alpha_color="black"
+    <string
+     name="message_max_lines_count">
+        4
+    </string>
+	<panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black"
 		height="50" label="header" layout="topleft" left="0" name="header"
 		top="0" width="350">
 		<icon follows="left|top|right|bottom" height="40"  width="40" layout="topleft"
@@ -13,21 +17,61 @@
 			Sender Name / Group Name
         </text>
 	</panel>
-	<text_editor type="string" length="1" bg_readonly_color="0 0 0 0"
-		follows="left|top|right|bottom" height="70" hide_scrollbar="true"
-		hide_border="true" layout="topleft" top="55" left="25" name="message"
-		text_color="GroupNotifyTextColor" text_readonly_color="GroupNotifyTextColor" width="300" word_wrap="true">
-		Message
-		Body
-    </text_editor>
-	<icon follows="left|top|right|bottom" height="16" width="16"
-		layout="topleft" top="135" left="25" mouse_opaque="true" name="attachment_icon" />
+	<text
+     follows="top"
+     height="20"
+     layout="topleft"
+     left="25"
+     name="subject"
+     text_color="GroupNotifyTextColor"
+     font="SansSerifBig"
+     top="60"
+     use_ellipses="true"
+     value="subject"
+     width="300"
+     word_wrap="true">
+     subject 
+    </text>
+    <text
+     follows="top"
+     height="20"
+     layout="topleft"
+     left="25"
+     name="datetime"
+     text_color="GroupNotifyTextColor"
+     font="SansSerif"
+     top="80"
+     use_ellipses="true"
+     value="datetime"
+     width="300"
+     word_wrap="true">
+     datetime
+    </text>
+    <text
+     follows="left|top|bottom|right"
+     height="0"
+     layout="topleft"
+     left="25"
+     name="message"
+     text_color="GroupNotifyTextColor"
+     top="100"
+     use_ellipses="true"
+     value="message"
+     width="300"
+     word_wrap="true"
+     visible="true" >
+    </text>
+    <icon
+	  follows="left|bottom|right" height="15" width="15"
+		layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true"
+	/>
 	<text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
-		type="string" length="1" follows="left|top|right|bottom" layout="topleft"
-		left="45" top="135" height="15" width="280" name="attachment"
-		text_color="GroupNotifyTextColor">
+		type="string" length="1" follows="left|bottom|right" layout="topleft"
+		left="45" bottom="122" height="15" width="280" name="attachment"
+		text_color="GroupNotifyTextColor" visible="true">
 		Attachment
-        </text>
-	<button label="OK" layout="topleft" top="170" left="140" height="20"
-		width="70" name="btn_ok" />
-</panel>
+     </text>
+
+	<button label="OK" layout="topleft" bottom="145" left="140" height="20"
+		width="70" name="btn_ok" follows="bottom" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 169fde7b47..ace456918c 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -10,6 +10,10 @@
  name="im_panel"
  top="0"
  width="350">
+    <string
+     name="message_max_lines_count">
+        6
+    </string>
     <panel
      background_visible="true"
      bevel_style="in"
@@ -56,7 +60,7 @@
          width="50" />
     </panel>
     <text
-     follows="left|bottom|right"
+     follows="left|top|bottom|right"
      height="60"
      layout="topleft"
      left="10"
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 dee911a45d..80dca8c0c1 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -107,8 +107,8 @@
 	<!--      picture_style="true" -->
 	<!--      top_delta="0" -->
 	<!--      width="168" /> -->
-	    
-	    <search_editor
+
+        <search_combo_box
 	     bevel_style="none"
 	     border_style="line"
 	     border.border_thickness="0"
@@ -118,12 +118,15 @@
 	     height="22"
 	     label="Search"
 	     layout="topleft"
-	     left_pad="7"
+	     right="-10"
 	     mouse_opaque="false"
-	     name="search_input"
+	     name="search_combo_box"
 	     tool_tip="Search"
 	     top_delta="0"
-	     width="200" />        
+	     width="200" >
+         <combo_editor
+          label="Search" />
+        </search_combo_box>
 	</panel>
 	
     <favorites_bar
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 6f4110067b..4c8c4efbe7 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
@@ -8,6 +8,26 @@
  name="picture_item"
  top="0"
  width="275">
+    <icon
+     height="120" 
+     image_name="ListItem_Over"
+     left="0" 
+     mouse_opaque="false"
+     name="hovered_icon" 
+     top="0"
+     scale_image="true" 
+     visible="false"
+     width="270"/>
+    <icon
+     height="120" 
+     image_name="ListItem_Select"
+     left="0" 
+     mouse_opaque="false"
+     name="selected_icon"
+     top="0"
+     scale_image="true"
+     visible="false"
+     width="270"/>
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
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 e9eac2c9dc..e166675364 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -57,6 +57,13 @@
         label="Group Info" 
         border="true"
       />
+      <panel 
+        class="panel_block_list_sidetray"
+        name="panel_block_list_sidetray" 
+        filename="panel_block_list_sidetray.xml" 
+        label="Blocked Residents &amp; Objects"
+        border="true"
+      />
 
     </panel_container>
   </sidetray_tab>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
new file mode 100644
index 0000000000..eabacbecb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<accordion_tab 
+    header_collapse_img="accordion_collapsed.tga" 
+    header_collapse_img_pressed="accordion_collapsed.tga" 
+    header_expand_img="accordion_expanded.tga"
+    header_expand_img_pressed="accordion_expanded.tga" />
diff --git a/indra/newview/skins/default/xui/en/widgets/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml
index 8c264205d5..4a59716464 100644
--- a/indra/newview/skins/default/xui/en/widgets/list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list.xml
@@ -6,4 +6,5 @@
  background_visible="false"
  background_opaque="false"
  item_pad="5"
+ keep_one_selected="true"
  multi_select="false" />
\ No newline at end of file
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 8f4d0edf95..297a3762f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -43,7 +43,7 @@
                           label=""
                           pad_right="0"
                           tool_tip="My Location History"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor"/>
+  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"/>
   <combo_editor name="Combo Text Entry"
                 text_pad_left="20"
                 select_on_focus="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
new file mode 100644
index 0000000000..1d43b25f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<search_combo_box
+ allow_text_entry="true"
+ list_position="BELOW"
+ show_text_as_tentative="false"
+ dropdown_button_visible="false"
+ background_image="TextField_Search_Off"
+ background_image_disabled="TextField_Search_Disabled"
+ background_image_focused="TextField_Search_Active">
+ <combo_editor
+  select_on_focus="true"
+  text_pad_left="20" 
+  background_image="TextField_Search_Off"
+  background_image_disabled="TextField_Search_Disabled"
+  background_image_focused="TextField_Search_Active"/>
+ <combo_list
+  multi_select="false"
+  page_lines="10" />
+ <search_button label=""
+  top_pad="4"
+  left_pad="4" 
+  width="13"
+  height="13" 
+  image_unselected="Search"
+  image_selected="Search" />
+</search_combo_box>
\ No newline at end of file