diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-18 20:06:32 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-18 20:06:32 +0200 |
commit | 1944f64107be98f344824045a19e113966591340 (patch) | |
tree | d6b199092d07abc44fdf57deeaf8a332f010610f /indra/newview/llviewermessage.cpp | |
parent | 1bf989705cf33fa27e404743108c6920cf33a7f2 (diff) | |
parent | c74f87015118a6da7036623d026fc512f46af9d5 (diff) |
manual merge -r 10503
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index bd0012057c..210557f68f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -272,7 +272,9 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_ } else { - LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving"), amount); + LLStringUtil::format_map_t args; + args["AMOUNT"] = llformat("%d", amount); + LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving", args), amount); } } |