diff options
author | Richard Nelson <none@none> | 2010-08-06 11:50:04 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-06 11:50:04 -0700 |
commit | 7f1c2b6db81afdbc91833069befe078d06744a66 (patch) | |
tree | 67a69d6c9529ceee87c6e6903c38f787528a26b5 /indra/llui | |
parent | a974ed98d04d05d9c682e85d3b25cf591d2b58c0 (diff) | |
parent | 7b41819377ec1c6ffc835a0a05a1acf571f46aad (diff) |
merge
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lluictrlfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 6ad104c1f4..c5bd6c7fce 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -103,7 +103,7 @@ void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitPa if (!full_filename.empty()) { LLUICtrlFactory::instance().pushFileName(full_filename); - LLFastXUIParser::instance().readXUI(full_filename, block); + LLSimpleXUIParser::instance().readXUI(full_filename, block); LLUICtrlFactory::instance().popFileName(); } } |