diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 15:05:47 -0400 |
| commit | e0c9174609e2457fab7fe6d7291c6ebbd030397c (patch) | |
| tree | a6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/llui/llloadingindicator.h | |
| parent | 9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff) | |
| parent | 207d9fd767895a3470722fb298eeef4f338e479a (diff) | |
merge
Diffstat (limited to 'indra/llui/llloadingindicator.h')
| -rw-r--r-- | indra/llui/llloadingindicator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h index c1f979c111..ffcb329f42 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::BatchBlock<Images> + struct Images : public LLInitParam::Block<Images> { Multiple<LLUIImage*> image; @@ -62,8 +62,8 @@ public: struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<F32> images_per_sec; - Optional<Images> images; + Optional<F32> images_per_sec; + Optional<Atomic<Images> > images; Params() : images_per_sec("images_per_sec", 1.0f), |