Merged from viewer-release

18 files changed, 241 insertions, 180 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 4643f66bd8..4b990fa566 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  can_resize="false"
- height="280"
+ can_close="true"
+ width="422"
+ height="202"
  layout="topleft"
- min_height="280"
- min_width="450"
  name="floater_buy_currency_html"
  help_topic="floater_buy_currency_html"
  save_rect="true"
  single_instance="true"
  title="BUY CURRENCY"
- width="452">
- <floater.string
-      name="buy_currency_url" translate="false">
-        https://quick-buy-www.jeff.ooze.lindenlab.com/en/display
- </floater.string>
-    <web_browser
-     bottom="278"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="2"
-     name="browser"
-     top="18"
-     width="450" />
+>
+  <floater.string
+    name="buy_currency_url" translate="false">
+    https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+  </floater.string>
+  <web_browser
+    follows="all"
+    layout="topleft"
+    left="1"
+    right="-1" 
+    top="1"
+    bottom="-1" 
+    ignore_ui_scale="false"
+    name="browser"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f3d297c303..7d81c3e551 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -38,91 +38,129 @@
     left="20"
     top_pad="-30"
     name="new_snapshot_btn"
-    width="23" />
+    width="23"
+    commit_callback.function="Snapshot.Refresh"/>
   <line_editor
     border_style="line"
     border_thickness="1"
-	  follows="left|top"
-	  height="20"
-		layout="topleft"
+    follows="left|top"
+    height="20"
+    layout="topleft"
     left="10"
-		max_length="500"
+    max_length="500"
     name="description"
-	  top_pad="15"
-	  width="230"
+    top_pad="15"
+    width="230"
     label="Description"/>
+  <panel
+   top_pad="20"
+   left="10"
+   height="83"
+   name="panel_snapshot_main"
+   width="130">
+    <button
+     label="Share Snapshot"
+     name="share"
+     top="0"
+     left="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="share"/>
+    <button
+     label="Save Snapshot"
+     name="save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="save"/>
+    <button
+     label="Set As Profile Pic"
+     name="set_profile_pic"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_share"
+   width="130">
+    <button
+     label="Share to Web"
+     name="share_to_web"
+     top="0"
+     left="0"
+     visible="false"
+     width="130"/>
+    <button
+     label="Email Snapshot"
+     name="share_to_email"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_share"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_save"
+   width="130">
+    <button
+     label="Save to My Inventory"
+     name="save_to_inventory"
+     top="0"
+     left="0"
+     width="130"/>
+    <button
+     label="Save to My Computer"
+     name="save_to_computer"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
   <button
-   label="Share Snapshot" 
-   name="share" 
-   top_pad="20" 
-   left="10" 
-   width="130"/>
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="show_advanced"
+   image_overlay="TabIcon_Close_Off"
+   bottom_delta="0"
+   width="30"
+   commit_callback.function="Snapshot.ShowAdvanced"/>
   <button
-   label="Share to Web" 
-   name="share_to_web" 
-   top_delta="0" 
-   left="10" 
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="hide_advanced"
+   image_overlay="TabIcon_Open_Off"
+   top_delta="0"
    visible="false"
-   width="130"/>
-  <button
-   label="Save to My Inventory" 
-   name="save_to_inventory" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save Snapshot" 
-   name="save" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Email Snapshot" 
-   name="share_to_email" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save to My Computer" 
-   name="save_to_computer" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Set As Profile Pic" 
-   name="set_profile_pic" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Back" 
-   name="cancel" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-    name="show_advanced"
-    image_overlay="TabIcon_Close_Off"
-    top_delta="1"
-    width="30"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-     visible="false" 
-     name="hide_advanced"
-     image_overlay="TabIcon_Open_Off"
-     top_delta="0"
-     width="30"/>
+   width="30"
+   commit_callback.function="Snapshot.HideAdvanced"/>
   <panel 
-    visible="false" 
-    left="250" 
-    top="17"    
-    name="snapshot_advanced" 
-    filename="panel_snapshot_advanced.xml"/>
+   visible="false"
+   left="250"
+   top="17"
+   name="snapshot_advanced"
+   filename="panel_snapshot_advanced.xml"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 4e6a07d020..62365f7cc2 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -61,14 +61,6 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Empty Trash"
-     layout="topleft"
-     name="empty_trash">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_trash" />
-    </menu_item_call>
-    <menu_item_call
      label="Empty Lost and Found"
      layout="topleft"
      name="empty_lostnfound">
@@ -111,4 +103,15 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="find_links" />
         </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="empty_trash">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_trash" />
+    </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index b5eda8e999..c4e31ed180 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -170,7 +170,7 @@
 
     <menu_item_separator />
     <menu_item_call
-     label="Rename"
+     label="Rename Outfit"
      layout="topleft"
      name="rename">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index fa5ca60a19..430a7b6444 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -38,13 +38,6 @@
      layout="topleft"
      name="wearable_attach_to_hud" />
     <menu_item_call
-     label="Object Profile"
-     layout="topleft"
-     name="object_profile">
-        <on_click
-         function="Attachment.Profile" />
-    </menu_item_call>
-    <menu_item_call
      label="Take Off"
      layout="topleft"
      name="take_off">
@@ -59,6 +52,13 @@
          function="Wearable.Edit" />
     </menu_item_call>
     <menu_item_call
+     label="Object Profile"
+     layout="topleft"
+     name="object_profile">
+        <on_click
+         function="Attachment.Profile" />
+    </menu_item_call>
+    <menu_item_call
      label="Show Original"
      layout="topleft"
      name="show_original">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d3d0f13bf..aca3b750c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2066,6 +2066,7 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
+    <unique/>
   </notification>
 
   <notification
@@ -6207,7 +6208,7 @@ The button will be shown when there is enough space for it.
    icon="notifytip.tga"
    name="ShareNotification"
    type="notifytip">
-Drag items from inventory onto a person in the resident picker
+Select residents to share with.
   </notification>
   <notification
    icon="notifytip.tga"
@@ -6304,36 +6305,39 @@ Avatar '[NAME]' entered appearance mode.
 Avatar '[NAME]' left appearance mode.
   </notification>
 
-    <notification
+  <notification
    icon="alertmodal.tga"
    name="NoConnect"
    type="alertmodal">
-        We're having trouble connecting using [PROTOCOL] [HOSTID].
-        Please check your network and firewall setup.
-        <form name="form">
-            <button
-               default="true"
-               index="0"
-               name="OK"
-               text="OK"/>
-        </form>
-    </notification>
+We're having trouble connecting using [PROTOCOL] [HOSTID].
+Please check your network and firewall setup.
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+    </form>
+  </notification>
 
-    <notification
-          icon="alertmodal.tga"
-          name="NoVoiceConnect"
-          type="alertmodal">
-        We're having trouble connecting your voiceserver using [HOSTID].
-        Voice communications will not be available.
-        Please check your network and firewall setup.
-        <form name="form">
-            <button
-               default="true"
-               index="0"
-               name="OK"
-               text="OK"/>
-        </form>
-    </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="NoVoiceConnect"
+   type="alertmodal">
+We're having trouble connecting to your voice server:
+
+[HOSTID]
+
+Voice communications will not be available.
+Please check your network and firewall setup.
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+    </form>
+  </notification>
 
   <notification
    icon="notifytip.tga"
@@ -6361,7 +6365,7 @@ Are you sure you want to leave this call?
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <notification
@@ -6378,7 +6382,7 @@ Mute everyone?
      name="okcancelignore"
      yestext="Ok"
      notext="Cancel"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <global name="UnsupportedCPU">
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index d36c2a4e6f..f016c27b0a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -28,7 +28,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -44,7 +44,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -60,7 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="2"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 20652df918..b1f4cbb079 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -49,16 +49,26 @@
      top="4"
      value="..."
      width="359" />
-    <button 
-     name="btn_add"
+    <panel
+     name="btn_add_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="AddItem_Off"
      top="0"
      left="0"
      height="23"
-     width="23"
-     tab_stop="false" />
+     width="26"
+     tab_stop="false">
+      <button 
+       name="btn_add"
+       layout="topleft"
+       follows="top|right"
+       image_overlay="AddItem_Off"
+       top="0"
+       left="0"
+       height="23"
+       width="23"
+       tab_stop="false" />
+    </panel>
     <icon
      follows="left|right|top"
      height="3"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index cf15fb0455..d295f5fe4a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -8,19 +8,22 @@
 	 name="edit_shape_panel"
 	 top_pad="10"
 	 width="333" >
-	 <text
-		 follows="top|left|right"
-		 font="SansSerifSmallBold"
-		 halign="right"
-		 height="12"
-		 layout="topleft"
-		 left="0"
-		 name="avatar_height"
-		 text_color="EmphasisColor"
-		 top="0"
-		 width="310">
-		 [HEIGHT] Meters tall
-	 </text>
+     <string name="meters">Meters</string>
+     <string name="feet">Feet</string>
+     <string name="height">Height:</string>
+     <string name="heigth_label_color" translate="false">White_50</string>
+     <string name="heigth_value_label_color" translate="false">White</string>
+     <text
+         follows="top|left|right"
+         font="SansSerifSmallBold"
+         halign="right"
+         height="12"
+         layout="topleft"
+         left="0"
+         name="avatar_height"
+         top="0"
+         width="310">
+     </text>
      <panel
          border="false"
          bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 8604f42e75..645ee8a435 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -7,6 +7,7 @@
  label="Wearable"
  layout="topleft"
 left="0"
+ help_topic="edit_wearable"
  name="panel_edit_wearable"
 	top="0"
  width="333">
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 19fe2ea874..6523b0d491 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -74,16 +74,14 @@ Maximum 200 per group daily
     </text>
       <button
        follows="top|left"
-       height="18"
-       image_selected="AddItem_Press"
-       image_unselected="AddItem_Off"
-       image_disabled="AddItem_Disabled"
+       height="23"
+       image_overlay="AddItem_Off"
        layout="topleft"
        left="5"
        name="create_new_notice"
        tool_tip="Create a new notice"
-     top_delta="-3"
-       width="18" />
+       top_delta="-3"
+       width="23" />
      <button
      follows="top|left"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d65b86f007..2a53b3e2fa 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -42,7 +42,7 @@
   <filter_editor
    text_pad_left="10"
    follows="left|top|right"
- height="23"
+   height="23"
    label="Filter Inventory"
    layout="topleft"
    left="10"
@@ -68,10 +68,10 @@
      top_pad="10"
      width="312">
     <inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -82,13 +82,14 @@
      left="0"
      name="All Items"
      sort_order_setting="InventorySortOrder"
+	 show_item_link_overlays="true"
      top="16"
      width="288" />
     <recent_inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -98,6 +99,7 @@
      layout="topleft"
      left_delta="0"
      name="Recent Items"
+	 show_item_link_overlays="true"
      width="290" />
   </tab_container>
   <layout_stack
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index feee532320..741f60669a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -6,6 +6,7 @@
  height="600"
  follows="all"
  layout="topleft"
+ help_topic="edit_outfit"
  left="0"
  min_height="350"
  name="outfit_edit"
@@ -50,6 +51,7 @@
     <string name="Filter.All" value="All"/>
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
+    <string name="Filter.Custom" value="Custom filter"/>
 
 
     <button
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 13e1f5ba5c..de1f2cf31b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -30,6 +30,7 @@
            height="490"
            name="outfitslist_tab"
            background_visible="true"
+           help_topic="my_outfits_tab"
            follows="all"
            label="MY OUTFITS"
            layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 1c68d59993..a69e8d29b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -348,7 +348,7 @@
        Busy mode response:
     </text>
     <text_editor
-     control_name="BusyModeResponse2"
+     control_name="BusyModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c816fd1479..b736f5e29c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -395,7 +395,7 @@ top_pad="10"
 			    label_width="75"
 			    left="120"
 			    width="170"
-			    min_val="1"
+			    min_val="0"
 			    height="23"
 			    max_val="999999999"
 			    top_pad="10"/>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d14a6b3c8..294267d43b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3181,12 +3181,12 @@ Abuse Report</string>
 
   <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
   <string name="sentences_separator" value=" "></string>
-  <string name="words_separator">, </string>
+  <string name="words_separator" value=", "/>
   
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
 
-	Please check secondlife.com/status to see if there is a known problem with the service.  
+	Please check status.secondlifegrid.net to see if there is a known problem with the service.  
         If you continue to experience problems, please check your network and firewall setup.
   </string>
 
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index b817ba56ca..05d7447a6f 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -8,7 +8,6 @@
      height="100"
      h_pad="10"
      name="no_visible_items_msg"
-     value="There are no visible content here."
      v_pad="15"
      width="200"
      wrap="true "/>