diff options
| author | angela <angela@lindenlab.com> | 2010-02-03 13:56:39 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-03 13:56:39 +0800 |
| commit | 460ec67b97bc210c0a03483dd0b754e92fabe806 (patch) | |
| tree | 90bd49da9c7e23e6b90ebf04b8fcc9847b4f414e /indra/newview/llpanelclassified.cpp | |
| parent | 1094fa28c618370af9a95cf823cbd9287c92dd24 (diff) | |
| parent | 86923afd27d76734cf1274fa788928230c232a4d (diff) | |
resolve merge in llsidepanelinventory.cpp
Diffstat (limited to 'indra/newview/llpanelclassified.cpp')
| -rw-r--r-- | indra/newview/llpanelclassified.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 3f5d80c123..1e46827c1a 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -1231,12 +1231,14 @@ void LLPanelClassifiedInfo::processProperties(void* data, EAvatarProcessorType t static std::string mature_str = getString("type_mature"); static std::string pg_str = getString("type_pg"); + static LLUIString price_str = getString("l$_price"); bool mature = is_cf_mature(c_info->flags); childSetValue("content_type", mature ? mature_str : pg_str); childSetValue("auto_renew", is_cf_auto_renew(c_info->flags)); - childSetTextArg("price_for_listing", "[PRICE]", llformat("%d", c_info->price_for_listing)); + price_str.setArg("[PRICE]", llformat("%d", c_info->price_for_listing)); + childSetValue("price_for_listing", LLSD(price_str)); setInfoLoaded(true); } |