diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:58:09 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:58:09 -0700 |
| commit | 0991a8a870b9cfee57a76f45f4f5ee1c5eb6d4cd (patch) | |
| tree | 2c503e2bec1398185e41875b3c357e5afb126c2b /indra/llui/llloadingindicator.cpp | |
| parent | 6fe4815217a11a36aa2e2b1d8b040eff007bb631 (diff) | |
| parent | 09e179b2381a4db03309839babae664feb9b0886 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llloadingindicator.cpp')
| -rw-r--r-- | indra/llui/llloadingindicator.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp index c4eec1835c..6ac38f5ad4 100644 --- a/indra/llui/llloadingindicator.cpp +++ b/indra/llui/llloadingindicator.cpp @@ -34,6 +34,7 @@ // Project includes #include "lluictrlfactory.h" #include "lluiimage.h" +#include "boost/foreach.hpp" // registered in llui.cpp to avoid being left out by MS linker //static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator"); @@ -51,11 +52,9 @@ LLLoadingIndicator::LLLoadingIndicator(const Params& p) void LLLoadingIndicator::initFromParams(const Params& p) { - for (LLInitParam::ParamIterator<LLUIImage*>::const_iterator it = p.images().image.begin(), end_it = p.images().image.end(); - it != end_it; - ++it) + BOOST_FOREACH(LLUIImage* image, p.images.image) { - mImages.push_back(it->getValue()); + mImages.push_back(image); } // Start timer for switching images. |