diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-29 11:08:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-29 11:08:00 -0400 |
| commit | b4df9fd2028e39186291a7829234ff3ba0f87cd0 (patch) | |
| tree | 992846ef7668c85b490c5e249d2059f7b23065be /indra/newview/llfloaterland.cpp | |
| parent | 58ff6b5033e514381a3e9e54d0d6fa681dcc1205 (diff) | |
| parent | 7e405ef0e3efce400db53ddc16d367680da659c9 (diff) | |
merge changes for storm-1220
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 9b7593ce61..4746f93009 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -566,10 +566,7 @@ void LLPanelLandGeneral::refresh() if (regionp) { insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY); - - std::string land_type; - bool is_land_type_localized = LLTrans::findString(land_type, regionp->getSimProductName()); - mLandType->setText(is_land_type_localized ? land_type : regionp->getSimProductName()); + mLandType->setText(regionp->getLocalizedSimProductName()); } // estate owner/manager cannot edit other parts of the parcel @@ -2883,13 +2880,7 @@ void LLPanelLandCovenant::refresh() } LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text"); - if (region_landtype) - { - 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()); - } + region_landtype->setText(region->getLocalizedSimProductName()); LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text"); if (region_maturity) |