aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llgivemoney.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-01-04 23:11:05 -0600
committerJacek Antonelli2010-01-04 23:11:05 -0600
commit09e719ccf7c835a81aa52a99c2adc43fd29b6a8a (patch)
tree6511b0b0596173e0f16ce542ba50aae81e19a9d9 /linden/indra/newview/llgivemoney.cpp
parentTidied up floater_pay.xml code and UI layout. (diff)
downloadmeta-impy-09e719ccf7c835a81aa52a99c2adc43fd29b6a8a.zip
meta-impy-09e719ccf7c835a81aa52a99c2adc43fd29b6a8a.tar.gz
meta-impy-09e719ccf7c835a81aa52a99c2adc43fd29b6a8a.tar.bz2
meta-impy-09e719ccf7c835a81aa52a99c2adc43fd29b6a8a.tar.xz
Implemented VWR-9597 (optional message when paying someone).
Diffstat (limited to 'linden/indra/newview/llgivemoney.cpp')
-rw-r--r--linden/indra/newview/llgivemoney.cpp9
1 files changed, 8 insertions, 1 deletions
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)
494 } 494 }
495 else 495 else
496 { 496 {
497 // Custom message typed in by the user.
498 std::string desc = LLStringUtil::null;
499 if (!childGetText("message").empty())
500 {
501 desc = childGetText("message");
502 }
503
497 // just transfer the L$ 504 // just transfer the L$
498 mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLStringUtil::null); 505 mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, desc);
499 506
500 // check if the payee needs to be unmuted 507 // check if the payee needs to be unmuted
501 LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY); 508 LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY);