summaryrefslogtreecommitdiff
path: root/indra/llui/llprogressbar.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-13 17:51:14 -0500
commit27f11d9868bc72e7096ae6266af1c6c9318c545e (patch)
tree12190521b6870891072e312c8b3e8864721aa075 /indra/llui/llprogressbar.h
parentfbab245e487650d6420c9fe33cf07123af12f422 (diff)
parentdd06d42c09e5e1f4b28559059ec8393e53f767a7 (diff)
merge
Diffstat (limited to 'indra/llui/llprogressbar.h')
-rw-r--r--indra/llui/llprogressbar.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llprogressbar.h b/indra/llui/llprogressbar.h
index 13297f7493..3f308e7496 100644
--- a/indra/llui/llprogressbar.h
+++ b/indra/llui/llprogressbar.h
@@ -27,14 +27,14 @@
#ifndef LL_LLPROGRESSBAR_H
#define LL_LLPROGRESSBAR_H
-#include "llview.h"
+#include "lluictrl.h"
#include "llframetimer.h"
class LLProgressBar
- : public LLView
+ : public LLUICtrl
{
public:
- struct Params : public LLInitParam::Block<Params, LLView::Params>
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
{
Optional<LLUIImage*> image_bar,
image_fill;
@@ -47,7 +47,7 @@ public:
LLProgressBar(const Params&);
virtual ~LLProgressBar();
- void setPercent(const F32 percent);
+ void setValue(const LLSD& value);
/*virtual*/ void draw();