summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-30 09:57:05 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-30 09:57:05 +0100
commit318fcd957d29184ecb61d41f2d5373c04711b57d (patch)
tree6d5114c8479993b07aafb04bfab64d9a70cf885c /indra/newview/llfloaterland.cpp
parent4dfb0b7b2d76cf288cca34c23218c4769ec76991 (diff)
parenta1c24eae81177e576e0329ebb0bcdb26729ec7bb (diff)
merge
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