diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 14:22:28 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 14:22:28 -0500 |
commit | ba5648757c4f0bff322f0b7e7426a097f799aefa (patch) | |
tree | 73d20fe091d54887242c5db12b9e0fb3f57e3673 /indra/newview/llscrollingpanelparam.cpp | |
parent | afbc78d0398d58c44b2b1fb692ce1a27577fc4b1 (diff) | |
parent | 069228420148f3d8d61fe26d3f24a1f8119a48fd (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rw-r--r-- | indra/newview/llscrollingpanelparam.cpp | 5 |
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); |