diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
| commit | 5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (patch) | |
| tree | 1ab6b0946d7bfb881a2ccfaa2382d24b46a6b729 /indra/newview/llviewertexturelist.cpp | |
| parent | 65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff) | |
| parent | c13f6afe73bea4311a91d65dde2f6e1c5bc453b3 (diff) | |
Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13
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 456516ab6b..bbf7c8e60e 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1544,7 +1544,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; @@ -1557,8 +1558,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(); |