diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/newview/llviewertexturelist.cpp | |
parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) |
Post-convert merge by convert_monolith.py from ./viewer-experience
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 456516ab6b..abe75a1224 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; |