From 09e719ccf7c835a81aa52a99c2adc43fd29b6a8a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 4 Jan 2010 23:11:05 -0600
Subject: Implemented VWR-9597 (optional message when paying someone).

---
 linden/indra/newview/llgivemoney.cpp                   |  9 ++++++++-
 .../newview/skins/default/xui/en-us/floater_pay.xml    | 18 +++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 6c14f49..ed67c97 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -494,8 +494,15 @@ void LLFloaterPay::give(S32 amount)
 		}
 		else
 		{
+			// Custom message typed in by the user.
+			std::string desc = LLStringUtil::null;
+			if (!childGetText("message").empty())
+			{
+				desc = childGetText("message");
+			}
+
 			// just transfer the L$
-			mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLStringUtil::null);
+			mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, desc);
 
 			// check if the payee needs to be unmuted
 			LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index aa62565..a8739f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -3,7 +3,7 @@
 <floater name="Give Money" title="Pay resident: [FIRST] [LAST]"
          rect_control="FloaterPayRectB"
          can_minimize="true" can_resize="false"
-         bottom="-197" left="439" height="155" width="300"
+         bottom="-197" left="439" height="185" width="300"
          min_height="100" min_width="100">
 
 
@@ -37,6 +37,22 @@
                bevel_style="in" border_thickness="1" follows="top|left" />
 
 
+	<text name="message text" type="string" length="1"
+        bottom_delta="-32" left="15" height="18" width="60"
+        v_pad="0" h_pad="0" bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+	      follows="left|top" font="SansSerif"  halign="left">
+    Message:
+	</text>
+
+	<line_editor name="message" max_length="140"
+               bottom_delta="1" left_delta="65" height="18" width="205"
+               bevel_style="in" border_style="line" border_thickness="1"
+	             follows="left|top|right" font="SansSerif"
+	             handle_edit_keys_directly="false"
+               select_all_on_focus_received="false" select_on_focus="false" />
+
+
 	<text name="amount text" type="string" length="1"
         bottom_delta="-28" left="15" height="18" width="60"
         v_pad="0" h_pad="0" bg_visible="false" drop_shadow_visible="true"
-- 
cgit v1.1