diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
| commit | 3240b188e958fa6232ddb03bc29adb968c7521ac (patch) | |
| tree | 2ee6663288dd21f03444a435addbb1925dd389e6 /indra/llui/llfloater.cpp | |
| parent | 89ff83d2e7aa6f5af27c3e235b467e5fcd2937a4 (diff) | |
| parent | 62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff) | |
Merged from viewer-release
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) { |