diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-03 17:13:14 -0700 |
| commit | 99ada9b047d1cda8f45ec7f193ec04328496a721 (patch) | |
| tree | 03daf2f4ab56de43b03f4f7b0963abe041ad67ec /indra/llui/llloadingindicator.h | |
| parent | cd467cc34f876920b35d3570f50dbad54ce4a42c (diff) | |
| parent | 37fdd27bcbd38b5cf22e0ff003f4d01b908996c7 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llloadingindicator.h')
| -rw-r--r-- | indra/llui/llloadingindicator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h index 7c44478848..c1f979c111 100644 --- a/indra/llui/llloadingindicator.h +++ b/indra/llui/llloadingindicator.h @@ -51,7 +51,7 @@ class LLLoadingIndicator LOG_CLASS(LLLoadingIndicator); public: - struct Images : public LLInitParam::Block<Images> + struct Images : public LLInitParam::BatchBlock<Images> { Multiple<LLUIImage*> image; @@ -63,7 +63,7 @@ public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { Optional<F32> images_per_sec; - Batch<Images> images; + Optional<Images> images; Params() : images_per_sec("images_per_sec", 1.0f), |