Skip to content
Snippets Groups Projects
Commit f112356d authored by richard's avatar richard
Browse files

added filenames to xui names output when using filename="" in XUI

reviewed by Richard
parent 595000c1
No related branches found
No related tags found
No related merge requests found
...@@ -512,6 +512,8 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu ...@@ -512,6 +512,8 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu
// add children using dimensions from referenced xml for consistent layout // add children using dimensions from referenced xml for consistent layout
setShape(params.rect); setShape(params.rect);
LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance()); LLUICtrlFactory::createChildren(this, referenced_xml, child_registry_t::instance());
setXMLFilename(xml_filename);
} }
// ask LLUICtrlFactory for filename, since xml_filename might be empty // ask LLUICtrlFactory for filename, since xml_filename might be empty
......
...@@ -101,6 +101,7 @@ LLSideTray* LLSideTray::getInstance() ...@@ -101,6 +101,7 @@ LLSideTray* LLSideTray::getInstance()
if (!sInstance) if (!sInstance)
{ {
sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",NULL, LLRootView::child_registry_t::instance()); sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",NULL, LLRootView::child_registry_t::instance());
sInstance->setXMLFilename("panel_side_tray.xml");
} }
return sInstance; return sInstance;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment