merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3

EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511

9 files changed, 143 insertions, 28 deletions

diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 02784bb74b..01d8054e9a 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!-- *NOTE: mantipov: to use the "use_ellipses" attribute label should be LEFT aligned 
-untill LLFontGL::render() is fixed to avoid this requirement-->
 <!-- *NOTE: mantipov: top & height should be synchronized with <favorites_bar> in the panel_navigation_bar.xml-->
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
new file mode 100644
index 0000000000..64f6ce9bb5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_landmark.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="201"
+ layout="topleft"
+ mouse_opaque="false"
+ name="landmark_overflow_menu"
+ width="128">
+    <menu_item_call
+     label="Copy SLURL"
+     layout="topleft"
+     name="copy">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="delete">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_call
+     enabled="false"
+     label="Create Pick"
+     layout="topleft"
+     name="pick">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="pick" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
new file mode 100644
index 0000000000..a9f98e35cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_place.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ height="201"
+ layout="topleft"
+ mouse_opaque="false"
+ name="place_overflow_menu"
+ width="128">
+     <menu_item_call
+     label="Make a Landmark"
+     layout="topleft"
+     name="landmark">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="landmark" />
+    </menu_item_call>
+    <menu_item_call
+     enabled="false"
+     label="Create Pick"
+     layout="topleft"
+     name="pick">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="pick" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_call
+     enabled="false"
+     label="Buy Pass"
+     layout="topleft"
+     name="pass">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="pass" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_call
+     enabled="false"
+     label="Edit"
+     layout="topleft"
+     name="edit">
+        <menu_item_call.on_click
+         function="Places.OverflowMenu.Action"
+         parameter="edit" />
+    </menu_item_call>
+</toggleable_menu>
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 454236f5ad..fd154792dd 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -40,6 +40,20 @@ Hover your mouse over the options for more help.
      name="help_button"
      top="8"
      width="20" /> -->
+    <line_editor
+     follows="left|top"
+     font="SansSerifSmall"
+     prevalidate_callback="asci"
+     halign="left"
+     height="16"
+     label="Type your new group name here"
+     layout="topleft"
+     left="10"
+     max_length="35"
+     name="group_name_editor"
+     top="10"
+     visible="false"
+     width="235" />
     <name_box
      follows="left|top"
      height="16"
@@ -47,7 +61,7 @@ Hover your mouse over the options for more help.
      layout="topleft"
      left="10"
      name="founder_name"
-     top_pad="10"
+     top="10"
      width="100" />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 93fc938622..e90a57a375 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -69,7 +69,7 @@
      left="5"
      visible="false"
      width="65" />
-      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="group_general_tab">
+      <accordion layout="topleft" left="2" width="296" top="28" height="600" follows="all" name="group_accordion">
 		<accordion_tab min_height="515" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>
 		</accordion_tab>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 0bfdb12806..6f4110067b 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,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  bevel_style="none"
- follows="top|left|right|bottom"
+ follows="top|left|right"
  height="120"
  layout="topleft"
  left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index edaa8f7fa7..bff28718a7 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -40,7 +40,6 @@
      scale_image="false"
      top="8"
      width="13" />
-
     <tab_container
      follows="all"
      height="326"
@@ -54,18 +53,17 @@
      class="panel_place_info"
      filename="panel_place_info.xml"
      follows="all"
-     layout="topleft"
-     top="30"
      height="326"
+     layout="topleft"
      left="0"
      name="panel_place_info"
+     top="30"
      visible="false" />
-    
     <panel
-     name="button_panel"
-     layout="topleft"
      height="25"
+     layout="topleft"
      left="0"
+     name="button_panel"
      top_pad="10"
      width="305">
         <button
@@ -75,8 +73,8 @@
          label="Teleport"
          layout="topleft"
          left="5"
-         top="0"
          name="teleport_btn"
+         top="0"
          width="80" />
         <button
          follows="bottom|left"
@@ -84,8 +82,8 @@
          height="25"
          label="Map"
          layout="topleft"
-         name="map_btn"
          left_pad="5"
+         name="map_btn"
          top="0"
          width="80" />
         <button
@@ -93,13 +91,22 @@
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         left_pad="5"
-         top="0"
          label="Share"
          layout="topleft"
+         left_pad="5"
          name="share_btn"
+         top="0"
          width="60" />
-
+        <button
+         follows="bottom|right"
+         font="SansSerifSmallBold"
+         height="25"
+         label="▼"
+         layout="topleft"
+         left_pad="5"
+         name="overflow_btn"
+         top="0"
+         width="30" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -110,8 +117,8 @@
          label="Create"
          layout="topleft"
          left="5"
-         top="0"
          name="create_landmark_btn"
+         top="0"
          width="60" />
         <button
          follows="bottom|left"
@@ -122,8 +129,8 @@
          image_unselected="widgets/ComboButton_Off.png"
          label="▼"
          layout="topleft"
-         name="folder_menu_btn"
          left_pad="0"
+         name="folder_menu_btn"
          top="0"
          width="20" />
     </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 904f8bde65..23c8223e7b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="out"
  follows="left|top|right|bottom"
- height="570"
+ height="420"
  label="Profile"
  layout="topleft"
  left="0"
@@ -57,15 +57,25 @@
     <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="570"
+     height="300"
      layout="topleft"
      left="0"
      name="profile_scroll"
+     reserve_scroll_corner="true"
      opaque="true"
      width="255">
+      
+     	<panel
+     	 name="scroll_content_panel"
+	     follows="left|top|right"
+	     layout="topleft"
+	     top="0"
+	     left="0"
+     	 width="240"
+	     height="500">
+	          		
         <panel
-         bevel_style="in"
-         follows="left|top"
+	     follows="left|top"
          height="125"
          layout="topleft"
          left="10"
@@ -79,7 +89,7 @@
              follows="top|left"
              height="125"
              layout="topleft"
-             left="10"
+             left="0"
              name="2nd_life_pic"
              top="10"
              width="125" />
@@ -263,6 +273,10 @@
          word_wrap="true">
             Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
         </text>
+        
+ 
+        </panel>
+        
     </scroll_container>
     <panel
      follows="bottom|left"
@@ -316,7 +330,6 @@
          width="75" />
     </panel>
     <panel
-     follows="bottom|left"
      height="30"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 629f1d260a..7ea059ba6a 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -39,6 +39,7 @@
          name="tab_icon"
          right="-10"
          top="10"
+         image_name="TabIcon_Home_Selected"
          width="20" />
         <text
          follows="left|right|bottom"
@@ -82,12 +83,12 @@
          color="DkGray"
          follows="top|right"
          height="20"
-         image_name="TabIcon_Places_Off"
          layout="topleft"
          name="tab_icon"
          right="-10"
          top="10"
-         width="20" />
+         width="20" 
+         image_name="TabIcon_Places_Selected"/>
         <text
          follows="left|right|bottom|top"
          font="SansSerifBold"
@@ -134,7 +135,8 @@
          name="tab_icon"
          right="-10"
          top="10"
-         width="20" />
+         width="20" 
+         image_name="TabIcon_Me_Selected"/>
         <text
          follows="left|right|bottom|top"
          font="SansSerifBold"
@@ -181,7 +183,8 @@
          name="tab_icon"
          right="-10"
          top="10"
-         width="20" />
+         width="20" 
+         image_name="TabIcon_Things_Selected"/>
         <text
          follows="left|right|bottom|top"
          font="SansSerifBold"