Subpanels created through ui factorymap callbacks which also call LLUICtrlFactory::getInstance()->buildFloater in said callbacks (opposed to using the filename attrib due to that not supporting sub-factorymap callbacks) now get a position fixup determined by parents position attribs for that subpanel after being built.

This commit is contained in:
Shyotl
2012-04-24 17:12:13 -05:00
parent e7649d8f1c
commit 35bd8d90be

View File

@@ -478,6 +478,16 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
{
if(!factory->builtPanel(panelp))
panelp->initPanelXML(node, parent, factory);
else
{
LLRect new_rect = panelp->getRect();
// override rectangle with embedding parameters as provided
panelp->createRect(node, new_rect, parent);
panelp->setOrigin(new_rect.mLeft, new_rect.mBottom);
panelp->setShape(new_rect);
// optionally override follows flags from including nodes
panelp->parseFollowsFlags(node);
}
}
return panelp;