diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-22 09:04:42 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-22 09:04:42 +0100 |
| commit | eeba10255bf41dfe50b975ded16a9fe9c30e4025 (patch) | |
| tree | 3f56f1e991aa007bd6a4f1d9784416fcbfb29fd7 /indra/newview/llviewermessage.cpp | |
| parent | c73bb0ae17538c0cb509bf6f0945a29c0ffd69dc (diff) | |
| parent | 28d4fe68f8a44924df294473471b47ccb11a2eb1 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 91b1a421ff..abac3d26bf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -55,8 +55,7 @@ #include "llagent.h" #include "llagentcamera.h" #include "llcallingcard.h" -//#include "llfirstuse.h" -#include "llfloaterbuycurrency.h" +#include "llbuycurrencyhtml.h" #include "llfloaterbuyland.h" #include "llfloaterland.h" #include "llfloaterregioninfo.h" @@ -283,7 +282,7 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_ { LLStringUtil::format_map_t args; args["AMOUNT"] = llformat("%d", amount); - LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving", args), amount); + LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("giving", args), amount ); } } |