diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
| commit | db11a76d519ebb076ec0b72284993d7f6c15f383 (patch) | |
| tree | 2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/llui/llprogressbar.cpp | |
| parent | 3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff) | |
| parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) | |
Merge from viewer-development post 2.4 release
Diffstat (limited to 'indra/llui/llprogressbar.cpp')
| -rw-r--r-- | indra/llui/llprogressbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp index aaa328754d..ead22686bc 100644 --- a/indra/llui/llprogressbar.cpp +++ b/indra/llui/llprogressbar.cpp @@ -50,7 +50,7 @@ LLProgressBar::Params::Params() LLProgressBar::LLProgressBar(const LLProgressBar::Params& p) -: LLView(p), +: LLUICtrl(p), mImageBar(p.image_bar), mImageFill(p.image_fill), mColorBackground(p.color_bg()), @@ -80,7 +80,7 @@ void LLProgressBar::draw() mImageFill->draw(progress_rect, bar_color); } -void LLProgressBar::setPercent(const F32 percent) +void LLProgressBar::setValue(const LLSD& value) { - mPercentDone = llclamp(percent, 0.f, 100.f); + mPercentDone = llclamp((F32)value.asReal(), 0.f, 100.f); } |