diff options
| author | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
| commit | 483f66e082dd758ac1efafdcb5ba9c277690d760 (patch) | |
| tree | 2e6f5c10c08e9bdf7caa11c31a40d6a3e9792ff4 /indra/llui/llfloater.cpp | |
| parent | 8f892d0f36fda170a5cecf0aea89887d6d0e45ef (diff) | |
| parent | 1683c7c6e99814e101312aad38718d393a2605e3 (diff) | |
merge
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) { |