From 796b14cfe0d11b40e4cda20095055676a09c7ca2 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 27 Sep 2016 18:35:30 +0300
Subject: MAINT-6775 ParserWarning spam in viewer log

---
 indra/newview/skins/default/xui/en/floater_avatar.xml       |  1 -
 indra/newview/skins/default/xui/en/floater_camera.xml       |  2 --
 indra/newview/skins/default/xui/en/floater_destinations.xml |  2 --
 .../skins/default/xui/en/floater_edit_hover_height.xml      |  1 -
 indra/newview/skins/default/xui/en/floater_im_container.xml |  2 --
 indra/newview/skins/default/xui/en/panel_notification.xml   | 13 ++++++-------
 indra/newview/skins/default/xui/en/panel_outfit_gallery.xml |  3 ---
 indra/newview/skins/default/xui/en/sidepanel_inventory.xml  |  1 -
 8 files changed, 6 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index cd5cca02bd..92c5d8bcbe 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="cascading"
- ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 521389d7b3..456e0c6b1e 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -49,7 +49,6 @@
          layout="topleft"
          left="8"
          name="preset_views_list"
-         opaque="true"
          top="24"
          width="212"
          visible="false">
@@ -107,7 +106,6 @@
           layout="topleft"
           left="8"
           name="camera_modes_list"
-          opaque="true"
           top="24"
           width="212"
           visible="false">
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 94ebaa9cb2..4fe8e3bdd1 100644
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="cascading"	
- ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
- user_resize="true"
  can_resize="true"
  min_height="230"
  min_width="350"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
index 8ec6735a01..52084e5f8e 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="cascading"
- ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
  can_close="true"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 28c89868bd..34fa0b0fe9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -121,7 +121,6 @@
              follows="all"
              layout="topleft"
              name="conversations_list_panel"
-             opaque="true"
              top_pad="0"
              left="5"
              right="-1"/>
@@ -144,7 +143,6 @@
                  follows="all"
                  layout="topleft"
                  name="stub_panel"
-                 opaque="true"
                  top_pad="0"
                  left="0"
                  right="-1">
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 94c468e1bb..4d9316768b 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
   background_opaque="false"
-      border_visible="false"
+  border_visible="false"
   background_visible="true"
   bg_alpha_color="PanelNotificationBackground"
   bg_opaque_color="PanelNotificationBackground"
@@ -10,18 +10,17 @@
   left="0"
   name="notification_panel"
   chrome="true"
-  show_title="false"
   top="0"
-  	height="140"
+  height="140"
   translate="false"
   width="305">
   <!-- THIS PANEL CONTROLS TOAST HEIGHT? -->
   <panel
-      border_visible="false"
- bevel_style="none"
+    border_visible="false"
+    bevel_style="none"
     background_visible="true"
-  bg_alpha_color="ToastBackground"
-  bg_opaque_color="ToastBackground"
+    bg_alpha_color="ToastBackground"
+    bg_opaque_color="ToastBackground"
     follows="left|right|top"
     height="100"
     label="info_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index c1272c6bf8..e3790ae09b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -34,12 +34,9 @@
     Searching...
   </text> 
   <scroll_container
-   border="true"
-   bevel_style="none"
    follows="all"
    height="400"
    width="312"
-   min_width="312"
    layout="topleft"
    left="4"
    top="0"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index d3e24a19ef..9995523e61 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -59,7 +59,6 @@
                  name="inbox_layout_panel"
                  visible="false"
                  min_dim="35"
-                 max_dim="235"
                  expanded_min_dim="90"
                  height="235">
                  <panel
-- 
cgit v1.2.3


From 70a82ac3df37bd868bf86ba0bdf4af1941706fad Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 28 Sep 2016 12:35:34 +0300
Subject: MAINT-6773 Add payment message

---
 indra/newview/skins/default/xui/en/floater_pay.xml | 24 ++++++++++++++++++++--
 indra/newview/skins/default/xui/en/strings.xml     |  3 +++
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 9d91f801a6..3e3f8b49ce 100644
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="186"
+ height="208"
  layout="topleft"
  name="Give Money"
  help_topic="give_money"
@@ -43,6 +43,26 @@
      width="180">
         Test Name That Is Extremely Long To Check Clipping
     </text>
+    <text
+     type="string"
+     follows="top|left"
+     height="18"
+     left="10"
+     name="payment_message_label"
+     top_pad="6"
+     width="120">
+        Description (optional):
+    </text>
+    <line_editor
+     border_style="line"
+     follows="left|top|right"
+     height="19"
+     top_delta="-2"
+     layout="topleft"
+     max_length_bytes="127"
+     name="payment_message"
+     right="-11"
+     width="109" />
     <panel
      border_thickness="0"
      height="104"
@@ -125,7 +145,7 @@
        top_pad="0"
        max_length_bytes="9"
        name="amount"
-       width="90" />
+       right="-1" />
       <button
        enabled="false"
        height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1eb186dfeb..a0a92c5293 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3694,12 +3694,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT] [REASON].</string>
+  <string name="paid_you_ldollars_gift">[NAME] paid you L$[AMOUNT]: [REASON]</string>
   <string name="paid_you_ldollars_no_reason">[NAME] paid you L$[AMOUNT].</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_ldollars_gift">You paid [NAME] L$[AMOUNT]: [REASON]</string>
   <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string>
   <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string>
   <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
   <string name="you_paid_failure_ldollars">You failed to pay [NAME] L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_failure_ldollars_gift">You failed to pay [NAME] L$[AMOUNT]: [REASON]</string>
   <string name="you_paid_failure_ldollars_no_info">You failed to pay L$[AMOUNT].</string>
   <string name="you_paid_failure_ldollars_no_reason">You failed to pay [NAME] L$[AMOUNT].</string>
   <string name="you_paid_failure_ldollars_no_name">You failed to pay L$[AMOUNT] [REASON].</string>
-- 
cgit v1.2.3