diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
| commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
| tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/llfloaterland.cpp | |
| parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
| parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) | |
merge changes for storm-1057
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index a6025661b7..7be4ebc690 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2871,7 +2871,10 @@ void LLPanelLandCovenant::refresh() LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text"); if (region_landtype) { - region_landtype->setText(region->getSimProductName()); + std::string land_type; + bool is_land_type_localized = LLTrans::findString(land_type, region->getSimProductName()); + + region_landtype->setText(is_land_type_localized ? land_type : region->getSimProductName()); } LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text"); |