summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexturelist.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-24 10:50:50 -0700
committerRichard Nelson <none@none>2010-08-24 10:50:50 -0700
commit77c42fc77ead297be3ea673309699edd15f70441 (patch)
tree58082e287471c84b76934dfc37503ab5ab95aee9 /indra/newview/llviewertexturelist.cpp
parent4115decfa14bb3d20f464ed0e0e3b3ec6c7b6e02 (diff)
parent65c9914d23022df6a39db50ce295750f08695893 (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r--indra/newview/llviewertexturelist.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 02097ea06d..181c5b4c81 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1550,7 +1550,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;