diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-19 13:55:53 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-19 13:55:53 -0500 |
| commit | 069228420148f3d8d61fe26d3f24a1f8119a48fd (patch) | |
| tree | ce261d94bffe33ddfb04680ecf4855d11965d195 | |
| parent | 6cea252986ef6d33f2e37333a286362b8e0272c5 (diff) | |
| parent | ddb7ce417979cedf733dadb09dbe0edd49b9f4bc (diff) | |
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG--
branch : avatar-pipeline
| -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); |