diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
commit | d65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch) | |
tree | 324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/newview/llviewertexturelist.cpp | |
parent | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff) | |
parent | d3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 36865b798c..275dfaa996 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1562,7 +1562,8 @@ bool LLUIImageList::initFromFile() } UIImageDeclarations images; - LLXUIParser::instance().readXUI(root, images, base_file_path); + LLXUIParser parser; + parser.readXUI(root, images, base_file_path); if (!images.validateBlock()) return false; @@ -1575,8 +1576,8 @@ bool LLUIImageList::initFromFile() for (S32 cur_pass = PASS_DECODE_NOW; cur_pass < NUM_PASSES; cur_pass++) { - for (LLInitParam::ParamIterator<UIImageDeclaration>::const_iterator image_it = images.textures().begin(); - image_it != images.textures().end(); + for (LLInitParam::ParamIterator<UIImageDeclaration>::const_iterator image_it = images.textures.begin(); + image_it != images.textures.end(); ++image_it) { std::string file_name = image_it->file_name.isProvided() ? image_it->file_name() : image_it->name(); |