Merge from default branch

--HG--
branch : product-engine

5 files changed, 30 insertions, 60 deletions

diff --git a/indra/newview/skins/default/textures/icons/Inv_Link.png b/indra/newview/skins/default/textures/icons/Inv_Link.png
new file mode 100644
index 0000000000..c1543dacb5
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Link.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 85ccf0f564..c02bf5741e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -228,39 +228,7 @@ with the same filename but different name
   <texture name="Inv_TrashOpen" file_name="icons/Inv_TrashOpen.png" preload="false" />
   <texture name="Inv_Underpants" file_name="icons/Inv_Underpants.png" preload="false" />
   <texture name="Inv_Undershirt" file_name="icons/Inv_Undershirt.png" preload="false" />
-
-  <texture name="Inv_Alpha_Link" file_name="icons/Inv_Alpha_Link.png" preload="false" />
-  <texture name="Inv_Animation_Link" file_name="icons/Inv_Animation_Link.png" preload="false" />
-  <texture name="Inv_BodyShape_Link" file_name="icons/Inv_BodyShape_Link.png" preload="false" />
-  <texture name="Inv_CallingCard_Link" file_name="icons/Inv_CallingCard_Link.png" preload="false" />
-  <texture name="Inv_Clothing_Link" file_name="icons/Inv_Clothing_Link.png" preload="false" />
-  <texture name="Inv_Eye_Link" file_name="icons/Inv_Eye_Link.png" preload="false" />
-  <texture name="Inv_FolderClosed_Link" file_name="icons/Inv_FolderClosed_Link.png" preload="false" />
-  <texture name="Inv_FolderOpen_Link" file_name="icons/Inv_FolderOpen_Link.png" preload="false" />
-  <texture name="Inv_Gesture_Link" file_name="icons/Inv_Gesture_Link.png" preload="false" />
-  <texture name="Inv_Gloves_Link" file_name="icons/Inv_Gloves_Link.png" preload="false" />
-  <texture name="Inv_Hair_Link" file_name="icons/Inv_Hair_Link.png" preload="false" />
-  <texture name="Inv_LinkFolder_Link" file_name="icons/Inv_LinkFolder_Link.png" preload="false" />
-  <texture name="Inv_Jacket_Link" file_name="icons/Inv_Jacket_Link.png" preload="false" />
-  <texture name="Inv_LookFolderOpen_Link" file_name="icons/Inv_LookFolderOpen_Link.png" preload="false" />
-  <texture name="Inv_LookFolderClosed_Link" file_name="icons/Inv_LookFolderClosed_Link.png" preload="false" />
-  <texture name="Inv_Landmark_Link" file_name="icons/Inv_Landmark_Link.png" preload="false" />
-  <texture name="Inv_Notecard_Link" file_name="icons/Inv_Notecard_Link.png" preload="false" />
-  <texture name="Inv_Object_Link" file_name="icons/Inv_Object_Link.png" preload="false" />
-  <texture name="Inv_Object_Multi_Link" file_name="icons/Inv_Object_Multi_Link.png" preload="false" />
-  <texture name="Inv_Pants_Link" file_name="icons/Inv_Pants_Link.png" preload="false" />
-  <texture name="Inv_Script_Link" file_name="icons/Inv_Script_Link.png" preload="false" />
-  <texture name="Inv_Shirt_Link" file_name="icons/Inv_Shirt_Link.png" preload="false" />
-  <texture name="Inv_Shoe_Link" file_name="icons/Inv_Shoe_Link.png" preload="false" />
-  <texture name="Inv_Skin_Link" file_name="icons/Inv_Skin_Link.png" preload="false" />
-  <texture name="Inv_Skirt_Link" file_name="icons/Inv_Skirt_Link.png" preload="false" />
-  <texture name="Inv_Snapshot_Link" file_name="icons/Inv_Snapshot_Link.png" preload="false" />
-  <texture name="Inv_Socks_Link" file_name="icons/Inv_Socks_Link.png" preload="false" />
-  <texture name="Inv_Sound_Link" file_name="icons/Inv_Sound_Link.png" preload="false" />
-  <texture name="Inv_Tattoo_Link" file_name="icons/Inv_Tattoo_Link.png" preload="false" />
-  <texture name="Inv_Texture_Link" file_name="icons/Inv_Texture_Link.png" preload="false" />
-  <texture name="Inv_Underpants_Link" file_name="icons/Inv_Underpants_Link.png" preload="false" />
-  <texture name="Inv_Undershirt_Link" file_name="icons/Inv_Undershirt_Link.png" preload="false" />
+  <texture name="Inv_Link" file_name="icons/Inv_Link.png" preload="false" />
 
   <texture name="Linden_Dollar_Alert" file_name="widgets/Linden_Dollar_Alert.png"/>
   <texture name="Linden_Dollar_Background" file_name="widgets/Linden_Dollar_Background.png"/>
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/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/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 361af0e8fb..294267d43b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3186,7 +3186,7 @@ Abuse Report</string>
   <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>