diff options
| author | richard <none@none> | 2009-11-10 14:01:55 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-10 14:01:55 -0800 |
| commit | f112356d77ab0dd6e47446adf0513975bc4f38a7 (patch) | |
| tree | 35f5792e8e52d0e074fbe6bbf5461433e0a19a08 /indra | |
| parent | 595000c19c0499a0b612c272cd097a8f1ca578bd (diff) | |
added filenames to xui names output when using filename="" in XUI
reviewed by Richard
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llpanel.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsidetray.cpp | 1 |
2 files changed, 3 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 diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 061587f11b..c3da246039 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -101,6 +101,7 @@ LLSideTray* LLSideTray::getInstance() if (!sInstance) { sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",NULL, LLRootView::child_registry_t::instance()); + sInstance->setXMLFilename("panel_side_tray.xml"); } return sInstance; |