summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-07 15:58:20 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-07 15:58:20 -0700
commitc8cd7ef7a4da4482b776c37201b158a443dd737a (patch)
tree521c6dc7af632dc9df64a69c18997eb091d68f20 /indra/newview/llfloaterland.cpp
parentd1ad7a56beee603b336600d4aace1e4d4c0f5ade (diff)
parentd25a30e55b7e6a20173c3a53891489adc5610d72 (diff)
Pull update from viewer-development
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 df0d22561e..e124263db5 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -565,7 +565,10 @@ void LLPanelLandGeneral::refresh()
if (regionp)
{
insert_maturity_into_textbox(mContentRating, gFloaterView->getParentFloater(this), MATURITY);
- mLandType->setText(LLTrans::getString(regionp->getSimProductName()));
+
+ 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());
}
// estate owner/manager cannot edit other parts of the parcel