summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-12 15:52:03 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-12 15:52:03 -0700
commitd3422c8d9e90f8c5ea675b470f425b13ed602654 (patch)
tree6c154dfca958e33c327834427fe8afaba6270af0 /indra/newview/llfloaterland.cpp
parent0f7ca61386e4cf0f9efda7c380c40cc608f26ea3 (diff)
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (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 c4e5642203..a6025661b7 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