diff options
| author | Richard Linden <none@none> | 2010-06-22 13:42:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-22 13:42:55 -0700 |
| commit | 7a54ce3cf686d872425c3230b305156b83a36b26 (patch) | |
| tree | 4a5c774d61bd81f497adbb21abdf28859e97a026 /indra/llui/llfloater.cpp | |
| parent | a42cf03807385c214118298821d532f5b6b4d984 (diff) | |
EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startup
reviewed by Leyla
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 9a56372e68..39a6855273 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2754,10 +2754,10 @@ void LLFloater::initFromParams(const LLFloater::Params& p) LLFastTimer::DeclareTimer POST_BUILD("Floater Post Build"); -bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node) +bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::string& filename, LLXMLNodePtr output_node) { Params params(LLUICtrlFactory::getDefaultParams<LLFloater>()); - LLXUIParser::instance().readXUI(node, params); // *TODO: Error checking + LLXUIParser::instance().readXUI(node, params, filename); // *TODO: Error checking if (output_node) { |