summaryrefslogtreecommitdiff
path: root/indra/newview/llscrollingpanelparam.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-25 10:48:25 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-25 10:48:25 -0500
commit33450e6f1fc95e3552d2115bf7e4fcf05f3d7916 (patch)
treec1eb91a2cf7c6346d5c5d9c72a1ed841643ee52c /indra/newview/llscrollingpanelparam.cpp
parent41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff)
parentccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (diff)
Automated merge of ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rw-r--r--indra/newview/llscrollingpanelparam.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
index b5e55df1f5..32a915608e 100644
--- a/indra/newview/llscrollingpanelparam.cpp
+++ b/indra/newview/llscrollingpanelparam.cpp
@@ -86,9 +86,8 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_param
childSetEnabled("param slider", mAllowModify);
childSetCommitCallback("param slider", LLScrollingPanelParam::onSliderMoved, this);
- // *TODO: Translate
- std::string min_name = param->getMinDisplayName();
- std::string max_name = param->getMaxDisplayName();
+ std::string min_name = LLTrans::getString(param->getMinDisplayName());
+ std::string max_name = LLTrans::getString(param->getMaxDisplayName());
childSetValue("min param text", min_name);
childSetValue("max param text", max_name);