diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 23:10:05 +0000 |
| commit | 0f00eef21798520bcfe27ae03b3f1b2ae938ff13 (patch) | |
| tree | 81c5b33e296d316a10a76c5a9e4cd09790aaa029 /indra/newview/llfloaterproperties.cpp | |
| parent | ef0eb8dbcf3980a057ad0864efa1c8e1575a8428 (diff) | |
svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
| -rw-r--r-- | indra/newview/llfloaterproperties.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp index af2a717ff7..538e8415a0 100644 --- a/indra/newview/llfloaterproperties.cpp +++ b/indra/newview/llfloaterproperties.cpp @@ -557,14 +557,14 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item) if (is_for_sale) { radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1); - std::string numerical_price; + S32 numerical_price; numerical_price = sale_info.getSalePrice(); - childSetText("EditPrice",numerical_price); + childSetText("EditPrice",llformat("%d",numerical_price)); } else { radioSaleType->setSelectedIndex(-1); - childSetText("EditPrice",LLString::null); + childSetText("EditPrice",llformat("%d",0)); } } |