summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-06 07:32:56 -0400
committerOz Linden <oz@lindenlab.com>2011-04-06 07:32:56 -0400
commitf41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (patch)
treec0593e4d79918dc10173de5d3dfbb34e8c2ed40e /indra/newview/llfloaterland.cpp
parent85c97c19347c1409f8f7231940b0b8f3a57fc0a5 (diff)
parentb5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff)
merge changes for storm-1094
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r--indra/newview/llfloaterland.cpp5
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");