diff options
Diffstat (limited to 'linden/indra/newview/llfloaterbuycurrency.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterbuycurrency.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp index e957ba9..cbd41f4 100644 --- a/linden/indra/newview/llfloaterbuycurrency.cpp +++ b/linden/indra/newview/llfloaterbuycurrency.cpp | |||
@@ -113,7 +113,7 @@ LLFloaterBuyCurrencyUI* LLFloaterBuyCurrencyUI::soleInstance(bool createIfNeeded | |||
113 | #pragma warning(disable : 4355) | 113 | #pragma warning(disable : 4355) |
114 | #endif | 114 | #endif |
115 | LLFloaterBuyCurrencyUI::LLFloaterBuyCurrencyUI() | 115 | LLFloaterBuyCurrencyUI::LLFloaterBuyCurrencyUI() |
116 | : LLFloater("Buy Currency"), | 116 | : LLFloater(std::string("Buy Currency")), |
117 | mChildren(*this), | 117 | mChildren(*this), |
118 | mManager(*this) | 118 | mManager(*this) |
119 | { | 119 | { |
@@ -219,7 +219,7 @@ void LLFloaterBuyCurrencyUI::updateUI() | |||
219 | // error section | 219 | // error section |
220 | if (hasError) | 220 | if (hasError) |
221 | { | 221 | { |
222 | mChildren.setBadge("step_error", LLViewChildren::BADGE_ERROR); | 222 | mChildren.setBadge(std::string("step_error"), LLViewChildren::BADGE_ERROR); |
223 | 223 | ||
224 | LLTextBox* message = getChild<LLTextBox>("error_message"); | 224 | LLTextBox* message = getChild<LLTextBox>("error_message"); |
225 | if (message) | 225 | if (message) |
@@ -249,7 +249,7 @@ void LLFloaterBuyCurrencyUI::updateUI() | |||
249 | 249 | ||
250 | if (!hasError) | 250 | if (!hasError) |
251 | { | 251 | { |
252 | mChildren.setBadge("step_1", LLViewChildren::BADGE_NOTE); | 252 | mChildren.setBadge(std::string("step_1"), LLViewChildren::BADGE_NOTE); |
253 | 253 | ||
254 | if (mManager.buying()) | 254 | if (mManager.buying()) |
255 | { | 255 | { |
@@ -373,8 +373,8 @@ void LLFloaterBuyCurrency::buyCurrency(const std::string& name, S32 price) | |||
373 | { | 373 | { |
374 | if (gHideLinks) | 374 | if (gHideLinks) |
375 | { | 375 | { |
376 | LLStringBase<char>::format_map_t args; | 376 | LLStringUtil::format_map_t args; |
377 | args["[NAME]"] = name.c_str(); | 377 | args["[NAME]"] = name; |
378 | args["[PRICE]"] = llformat("%d", price); | 378 | args["[PRICE]"] = llformat("%d", price); |
379 | gViewerWindow->alertXml("NotEnoughCurrency", args); | 379 | gViewerWindow->alertXml("NotEnoughCurrency", args); |
380 | return; | 380 | return; |