diff options
| author | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
| commit | 1911993cc7761216c70b95e77b49da383c9e162d (patch) | |
| tree | 23ec59769bcaf192324e48141c94affe0ebf2ea0 /indra/newview/llviewertexturelist.cpp | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
| parent | 83c01b041d5b6527b3741b73d075afc4b7ad134c (diff) | |
merge
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; |