diff options
| author | Richard Nelson <none@none> | 2010-08-04 19:02:30 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-04 19:02:30 -0700 |
| commit | b2028085fdfddfd5a7ac0f52d9f34b84457b3b98 (patch) | |
| tree | ee23f50874516092fb8a11cfe8079b150222f128 /indra/llui/lluictrlfactory.cpp | |
| parent | f92a411c023e2178814c27216b4d4c36fcb5d784 (diff) | |
first pass at faster XUI parsing (no recursion support yet)
also made LLSD->param block parsing faster
Diffstat (limited to 'indra/llui/lluictrlfactory.cpp')
| -rw-r--r-- | indra/llui/lluictrlfactory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index a46d961709..6ad104c1f4 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -99,10 +99,11 @@ void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitPa std::string filename = std::string("widgets") + gDirUtilp->getDirDelimiter() + widget_tag + ".xml"; LLXMLNodePtr root_node; - if (LLUICtrlFactory::getLayeredXMLNode(filename, root_node)) + std::string full_filename = gDirUtilp->findSkinnedFilename(LLUI::getXUIPaths().front(), filename); + if (!full_filename.empty()) { - LLUICtrlFactory::instance().pushFileName(filename); - LLXUIParser::instance().readXUI(root_node, block, filename); + LLUICtrlFactory::instance().pushFileName(full_filename); + LLFastXUIParser::instance().readXUI(full_filename, block); LLUICtrlFactory::instance().popFileName(); } } |