diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-09 16:48:07 -0800 |
| commit | 95445fb1b56a60145933db0891133230c87274b8 (patch) | |
| tree | f9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/llui/llprogressbar.cpp | |
| parent | 089665ce4eab97d0ab58e08914f852219ed3fae7 (diff) | |
| parent | cf6147f7c092e6ca10697dea341099c5e281df00 (diff) | |
Merge with viewer-development.
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); } |