diff options
| author | Richard Linden <none@none> | 2010-08-25 16:47:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-25 16:47:07 -0700 |
| commit | 3604f7fe4b35758db3a730e5efa4a06b2326bdfb (patch) | |
| tree | ee8d4d7078c33eb20a773686a1c367e5a2e00cdb /indra/llui/llfloater.cpp | |
| parent | c1405887c982f5a7396892017e4ea426ede9af23 (diff) | |
| parent | a0b15c827ee7704c1557c9c882ec236d5d67f948 (diff) | |
merge
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 0cd692b4a4..e7d0950846 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2780,7 +2780,8 @@ LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build"); bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node) { Params params(LLUICtrlFactory::getDefaultParams<LLFloater>()); - LLXUIParser::instance().readXUI(node, params, filename); // *TODO: Error checking + LLXUIParser parser; + parser.readXUI(node, params, filename); // *TODO: Error checking if (output_node) { @@ -2788,8 +2789,7 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str setupParamsForExport(output_params, parent); Params default_params(LLUICtrlFactory::getDefaultParams<LLFloater>()); output_node->setName(node->getName()->mString); - LLXUIParser::instance().writeXUI( - output_node, output_params, &default_params); + parser.writeXUI(output_node, output_params, &default_params); } // Default floater position to top-left corner of screen |