diff options
| author | Richard Linden <none@none> | 2012-04-12 17:18:58 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-12 17:18:58 -0700 |
| commit | 8437bfb66ed78e5d4d16cf4458e19a5b25a74adb (patch) | |
| tree | 7841b4fb65f59cddedeb90976a61eb7cab404838 /indra/llui | |
| parent | 1e74372f50a2cb2ed3364e79344b0408e7e8d89b (diff) | |
| parent | 855fbc0bf331c116d20d402f427535f060f70345 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llloadingindicator.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llloadingindicator.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp index 6ac38f5ad4..1ede5b706f 100644 --- a/indra/llui/llloadingindicator.cpp +++ b/indra/llui/llloadingindicator.cpp @@ -52,7 +52,7 @@ LLLoadingIndicator::LLLoadingIndicator(const Params& p) void LLLoadingIndicator::initFromParams(const Params& p) { - BOOST_FOREACH(LLUIImage* image, p.images.image) + BOOST_FOREACH(LLUIImage* image, p.images().image) { mImages.push_back(image); } diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h index c1f979c111..4998a57263 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<Batch<Images> > images; Params() : images_per_sec("images_per_sec", 1.0f), |