diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
| commit | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (patch) | |
| tree | 54587047f6f27d3a1b58a23a1a532a4436e61f65 /indra/llui/llloadingindicator.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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. |