diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-26 11:41:33 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-26 11:41:33 +0300 |
commit | a8978c1b52ad03bcfdfde99cde988ef663e5b9cd (patch) | |
tree | 2d5f73a7c1bb2ac5a8cb5761d7c6f979e267f9b7 /indra/newview/llviewermessage.cpp | |
parent | daa8d2b823fa0ca2a084bfbb38a7ee04720e6829 (diff) | |
parent | 14418c197076d0eb01bb0852b8716fa966bc9d53 (diff) |
merge
--HG--
branch : product-engine
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 5b0b603d63..5836aff4e7 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 ); } } |