diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llfloaterbuyland.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llfloaterbuyland.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuyland.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index c6bb53aed7..9ae634c76f 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -1022,9 +1022,9 @@ void LLFloaterBuyLandUI::refreshUI() } else { - childSetText("info_parcel", "(no parcel selected)"); - childSetText("info_size", ""); - childSetText("info_price", ""); + childSetText("info_parcel", childGetText("no_parcel_selected")); + childSetText("info_size", LLString::null); + childSetText("info_price", LLString::null); } childSetText("info_action", @@ -1127,7 +1127,7 @@ void LLFloaterBuyLandUI::refreshUI() if (mIsForGroup) { - childSetTextArg("insufficient_land_credits", "[GROUP]", gAgent.mGroupName); + childSetTextArg("insufficient_land_credits", "[GROUP]", LLString(gAgent.mGroupName)); message += childGetText("insufficient_land_credits"); @@ -1306,7 +1306,7 @@ void LLFloaterBuyLandUI::startBuyPreConfirm() } childSetTextArg("pay_to_for_land", "[AMOUNT]", llformat("%d", mParcelPrice)); - childSetTextArg("pay_to_for_land", "[SELLER]", mParcelSellerName.c_str()); + childSetTextArg("pay_to_for_land", "[SELLER]", mParcelSellerName); action += childGetText("pay_to_for_land"); @@ -1349,3 +1349,4 @@ void LLFloaterBuyLandUI::onClickErrorWeb(void* data) self->close(); } + |