Skip to content
Snippets Groups Projects
Commit caa468a5 authored by Rick Pasetto's avatar Rick Pasetto
Browse files

fix for gcc

parent 595000c1
No related branches found
No related tags found
No related merge requests found
......@@ -449,3 +449,9 @@ const std::string* LLUICtrlFactory::getWidgetTag(const std::type_info* widget_ty
{
return LLWidgetNameRegistry::instance().getValue(widget_type);
}
// static
void LLUICtrlFactory::connect(LLView* parent, LLView* child)
{
parent->addChild(child);
}
\ No newline at end of file
......@@ -188,10 +188,15 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
T* widget = new T(params);
widget->initFromParams(params);
if (parent)
parent->addChild(widget);
{
connect(parent, widget);
}
return widget;
}
// fix for gcc template instantiation annoyance
static void connect(LLView* parent, LLView* child);
LLView* createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, const widget_registry_t&, LLXMLNodePtr output_node );
template<typename T>
......
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