diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-26 13:05:54 -0700 |
| commit | 1d67a9084199910d35a44ac427a07fc1d9d6a4fd (patch) | |
| tree | 4d942a13d1fd358a8a10a67554ea9a85b7f04c6f /indra/llui/llpanel.cpp | |
| parent | 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 (diff) | |
| parent | e84ff39e4c7c5b028a6b8b4f6dc5d37c525eb1c4 (diff) | |
merge with remote repo
Diffstat (limited to 'indra/llui/llpanel.cpp')
| -rw-r--r-- | indra/llui/llpanel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 742427525b..095200ddc3 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -474,7 +474,7 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu { //if we are exporting, we want to export the current xml //not the referenced xml - LLXUIParser::instance().readXUI(node, params); + LLXUIParser::instance().readXUI(node, params, xml_filename); Params output_params(params); setupParamsForExport(output_params, parent); output_node->setName(node->getName()->mString); @@ -490,14 +490,15 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu return FALSE; } - LLXUIParser::instance().readXUI(referenced_xml, params); + LLXUIParser::instance().readXUI(referenced_xml, params, xml_filename); // add children using dimensions from referenced xml for consistent layout setShape(params.rect); LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance()); } - LLXUIParser::instance().readXUI(node, params); + // ask LLUICtrlFactory for filename, since xml_filename might be empty + LLXUIParser::instance().readXUI(node, params, LLUICtrlFactory::getInstance()->getCurFileName()); if (output_node) { |