Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry

* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154

9 files changed, 331 insertions, 133 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 4d8f88c80b..e2cc1481c4 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -567,7 +567,7 @@
      reference="White_05" />
     <color
      name="ScrollDisabledColor"
-     reference="Unused?" />
+     reference="White_25" />
     <color
      name="ScrollHighlightedColor"
      reference="Unused?" />
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 3c7b6dad14..cc17e9dd4b 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
@@ -2,12 +2,26 @@
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
-  <menu_item_call name="sort_name" label="Sort by Name">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_name" />
-  </menu_item_call>
-  <menu_item_call name="sort_status" label="Sort by Status">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="sort_status" />
-  </menu_item_call>
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Status"
+   name="sort_status">
+      <menu_item_check.on_click
+       function="People.Friends.ViewSort.Action"
+       parameter="sort_status" />
+      <menu_item_check.on_check
+       function="People.Friends.ViewSort.CheckItem"
+       parameter="sort_status" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="view_icons" />
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 ed03cd467c..d09871cff3 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
@@ -2,12 +2,26 @@
 <menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false" opaque="true" color="MenuDefaultBgColor" drop_shadow="false">
-  <menu_item_call name="sort_most" label="Sort by Most Recent">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_recent" />
-  </menu_item_call>
-  <menu_item_call name="sort_name" label="Sort by Name">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="sort_name" />
-  </menu_item_call>
+  <menu_item_check
+   label="Sort by Most Recent"
+   name="sort_most">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_recent" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_recent" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by Name"
+   name="sort_name">
+      <menu_item_check.on_click
+       function="People.Recent.ViewSort.Action"
+       parameter="sort_name" />
+      <menu_item_check.on_check
+       function="People.Recent.ViewSort.CheckItem"
+       parameter="sort_name" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" />
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index b31a0d88a4..c95cf32a5a 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
@@ -1,45 +1,118 @@
-<menu name="menu_folder_gear"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" 
-     color="MenuDefaultBgColor" drop_shadow="true">
-     <menu_item_call name="add_landmark" label="Add Landmark">
-     <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="add_landmark" />
-     </menu_item_call>
-     <menu_item_call name="add_folder" label="Add Folder">
-     <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="category" />
-     <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="category" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="cut" label="Cut">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="cut" />
-     </menu_item_call>
-     <menu_item_call name="copy_folder" label="Copy">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy" />
-     </menu_item_call>
-     <menu_item_call name="paste" label="Paste">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="paste" />
-     <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="paste" />
-     </menu_item_call>
-     <menu_item_call name="rename" label="Rename">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="rename" />
-     </menu_item_call>
-     <menu_item_call name="delete" label="Delete">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="delete" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="expand" label="Expand">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand" />
-     </menu_item_call>
-     <menu_item_call name="collapse" label="Collapse">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse" />
-     </menu_item_call>
-     <menu_item_call name="expand_all" label="Expand all folders">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand_all" />
-     </menu_item_call>
-     <menu_item_call name="collapse_all" label="Collapse all folders">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse_all" />
-     </menu_item_call>
-     <menu_item_call name="sort_by_date" label="Sort by Date">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="sort_by_date" />
-     </menu_item_call>
-</menu>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_folder_gear"
+ visible="false">
+    <menu_item_call
+     label="Add Landmark"
+     layout="topleft"
+     name="add_landmark">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="add_landmark" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Folder"
+     layout="topleft"
+     name="add_folder">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="category" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Cut"
+     layout="topleft"
+     name="cut">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="copy_folder">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="paste">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="paste" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="rename">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="delete">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Expand"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse"
+     layout="topleft"
+     name="collapse">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="collapse" />
+    </menu_item_call>
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand_all">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="expand_all" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse_all">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="collapse_all" />
+    </menu_item_call>
+    <menu_item_check
+     label="Sort by Date"
+     layout="topleft"
+     name="sort_by_date">
+        <on_check
+         function="Places.LandmarksGear.Enable"
+         parameter="sort_by_date" />
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="sort_by_date" />
+    </menu_item_check>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index 2d8bb0dcb9..0246d775ee 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -1,56 +1,150 @@
-<menu name="menu_ladmark_gear"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false" opaque="true" 
-     color="MenuDefaultBgColor" drop_shadow="true">
-     <menu_item_call name="teleport" label="Teleport">
-     <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="teleport" />
-     </menu_item_call>
-     <menu_item_call name="more_info" label="More Information">
-     <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="more_info" />
-     </menu_item_call>
-     <menu_item_call name="show_on_map" label="Show on Map">
-     <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="show_on_map" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="add_landmark" label="Add Landmark">
-     <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="add_landmark" />
-     </menu_item_call>
-     <menu_item_call name="add_folder" label="Add Folder">
-     <menu_item_call.on_click function="Places.LandmarksGear.Add.Action" userdata="category" />
-     <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="category" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="cut" label="Cut">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="cut" />
-     </menu_item_call>
-     <menu_item_call name="copy_landmark" label="Copy Landmark">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy" />
-     </menu_item_call>
-     <menu_item_call name="copy_slurl" label="Copy SLURL">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="copy_slurl" />
-     </menu_item_call>
-     <menu_item_call name="paste" label="Paste">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="paste" />
-     <menu_item_call.on_enable function="Places.LandmarksGear.Enable" userdata="paste" />
-     </menu_item_call>
-     <menu_item_call name="rename" label="Rename">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="rename" />
-     </menu_item_call>
-     <menu_item_call name="delete" label="Delete">
-     <menu_item_call.on_click function="Places.LandmarksGear.CopyPaste.Action" userdata="delete" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="expand_all" label="Expand all folders">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="expand_all" />
-     </menu_item_call>
-     <menu_item_call name="collapse_all" label="Collapse all folders">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="collapse_all" />
-     </menu_item_call>
-     <menu_item_call name="sort_by_date" label="Sort by Date">
-     <menu_item_call.on_click function="Places.LandmarksGear.Folding.Action" userdata="sort_by_date" />
-     </menu_item_call>
-     <menu_item_separator layout="topleft" />
-     <menu_item_call name="create_pick" label="Create Pick">
-     <menu_item_call.on_click function="Places.LandmarksGear.Custom.Action" userdata="create_pick" />
-     </menu_item_call>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_ladmark_gear"
+ visible="false">
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="teleport">
+        <on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="teleport" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="teleport" />
+    </menu_item_call>
+    <menu_item_call
+     label="More Information"
+     layout="topleft"
+     name="more_info">
+        <on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="more_info" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="more_info" />
+    </menu_item_call>
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="show_on_map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Add Landmark"
+     layout="topleft"
+     name="add_landmark">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="add_landmark" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Folder"
+     layout="topleft"
+     name="add_folder">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="category" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Cut"
+     layout="topleft"
+     name="cut">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Landmark"
+     layout="topleft"
+     name="copy_landmark">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy SLURL"
+     layout="topleft"
+     name="copy_slurl">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="copy_slurl" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="paste">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="paste" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="rename">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="delete">
+        <on_click
+         function="Places.LandmarksGear.CopyPaste.Action"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand_all">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="expand_all" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse_all">
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="collapse_all" />
+    </menu_item_call>
+    <menu_item_check
+     label="Sort by Date"
+     layout="topleft"
+     name="sort_by_date">
+        <on_check
+         function="Places.LandmarksGear.Enable"
+         parameter="sort_by_date" />
+        <on_click
+         function="Places.LandmarksGear.Folding.Action"
+         parameter="sort_by_date" />
+    </menu_item_check>
+    <menu_item_call
+     label="Create Pick"
+     layout="topleft"
+     name="create_pick">
+        <on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="create_pick" />
+    </menu_item_call>
 </menu>
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 736a60cfe7..bac6f6e4d1 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -2,6 +2,7 @@
 <panel
  background_visible="true"
  bevel_style="in"
+ follows="left|top|right|bottom"
  height="570"
  label="Edit Pick"
  layout="topleft"
@@ -43,7 +44,7 @@
      left="10"
      top_pad="10"
      name="profile_scroll"
-     reserve_scroll_corner="true"
+     reserve_scroll_corner="false"
      opaque="true"
      width="313">
     <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 6f01202680..19285e8e48 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -24,20 +24,6 @@ Hover your mouse over the options for more help.
      name="incomplete_member_data_str">
         Retrieving member data
     </panel.string>
-    <panel.string
-     name="group_join_btn">
-        Join (L$[AMOUNT])
-    </panel.string>
-    <!--<button
-     follows="left|top"
-     height="16"
-     label="?"
-     label_selected="?"
-     layout="topleft"
-     left="255"
-     name="help_button"
-     top="8"
-     width="20" /> -->
     <text_editor
      type="string"
      follows="left|top"
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 fb4ce436e8..c3b277fb1d 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
@@ -20,6 +20,10 @@
      name="group_join_btn">
         Join (L$[AMOUNT])
     </panel.string>
+    <panel.string
+     name="group_join_free">
+        Free
+    </panel.string>
     <button
      layout="topleft"
      name="back"
@@ -87,16 +91,28 @@
      top_pad="10"
      use_ellipses="true"
      width="140" />
+    <text
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="join_cost_text"
+     top_pad="10"
+     visible="true"
+     width="140">
+      Free
+    </text>
     <button
      follows="left|top"
      left_delta="0"
      top_pad="10"
      height="20"
-     label="Join"
-     label_selected="Join"
+     label="Join now!"
+     label_selected="Join now!"
      name="btn_join"
      visible="true"
-     width="65" />
+     width="85" />
     <button
      top="632"
      height="20"
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 1f12a9782e..a67ae59b4a 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -41,7 +41,7 @@
      left="10"
      top_pad="10"
      name="profile_scroll"
-     reserve_scroll_corner="true"
+     reserve_scroll_corner="false"
      width="313">
     <panel
      name="scroll_content_panel"
@@ -74,7 +74,7 @@
          name="pick_name"
          text_color="white"
          value="[name]"
-         word_wrap="true" />
+         use_ellipses="true" />
         <text
          follows="left|top"
          height="25"