diff options
| author | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
| commit | 957055396d2ffa3a76b09c60cb9c3e1f73870cbf (patch) | |
| tree | 632ecbdc0c21b0e14eb72f74faa8c04765f54489 /indra/newview/llscrollingpanelparam.cpp | |
| parent | ef46d4077ca4aad322aabfe545885be136577c8a (diff) | |
| parent | 59eb8a43a467ecaa5a8c2b58bf1abfb8350c0202 (diff) | |
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
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); |