summaryrefslogtreecommitdiff
path: root/indra/llui/llprogressbar.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:54:45 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:54:45 -0800
commit740bd8dbfd791bdd548064912abad8c0bf230f4c (patch)
treebd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/llui/llprogressbar.cpp
parent049b00a6f10d50609055810b0800f49476b351d2 (diff)
parentab100825bd0064dc64b9ef8bea1c70bc04090716 (diff)
merge
Diffstat (limited to 'indra/llui/llprogressbar.cpp')
-rw-r--r--indra/llui/llprogressbar.cpp6
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);
}