diff options
| author | Richard Linden <none@none> | 2010-10-08 17:38:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-08 17:38:19 -0700 |
| commit | c25216ca3a1bc4bd7a88a2519fe156a00902e85c (patch) | |
| tree | 44dee6f5dbfd63531f66595503490ca2a3c9028e /indra/llui/llprogressbar.h | |
| parent | f65bd3c1f18675910c9d49db217a1926bd04494e (diff) | |
| parent | 77d1fa974ad6cc9be0b84e574b455693bfa7f702 (diff) | |
merge
Diffstat (limited to 'indra/llui/llprogressbar.h')
| -rw-r--r-- | indra/llui/llprogressbar.h | 8 |
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(); |