diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
commit | d23f7df822b6c0557f9426b5e1aa660b77aba01e (patch) | |
tree | 2e86e4ec60018beabd35a54cc18fdf322a504269 /indra/llui/llprogressbar.cpp | |
parent | cf64ecb41dbbdcdc3c512510c4a7ebd28c832314 (diff) | |
parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) |
merge
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); } |