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/default')

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