diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
commit | db3991ca235f3ceefe888d03758cac5eccf1b552 (patch) | |
tree | c4712870f33c4b0fdcc13959ba2f940aa396b6b2 /indra/llui/llpanel.cpp | |
parent | 2fd51b4c711aa7ab70da6d7e7dfcb380b87cbedf (diff) | |
parent | b34ee7f9f405e25ac606a16435ed49c7187387d8 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r-- | indra/llui/llpanel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 07c0f3ce84..89c4656297 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -512,6 +512,8 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu // add children using dimensions from referenced xml for consistent layout setShape(params.rect); LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance()); + + setXMLFilename(xml_filename); } // ask LLUICtrlFactory for filename, since xml_filename might be empty |