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

fix for gcc build

parent e5c9fe00
No related branches found
No related tags found
No related merge requests found
...@@ -396,6 +396,7 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& na ...@@ -396,6 +396,7 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& na
//static //static
void LLUICtrlFactory::setCtrlParent(LLView* view, LLView* parent, S32 tab_group) void LLUICtrlFactory::setCtrlParent(LLView* view, LLView* parent, S32 tab_group)
{ {
if (tab_group == S32_MAX) tab_group = parent->getLastTabGroup();
parent->addChild(view, tab_group); parent->addChild(view, tab_group);
} }
......
...@@ -201,7 +201,7 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory> ...@@ -201,7 +201,7 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
if (parent) if (parent)
{ {
S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : parent->getLastTabGroup(); S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : S32_MAX;
setCtrlParent(widget, parent, tab_group); setCtrlParent(widget, parent, tab_group);
} }
return widget; return widget;
...@@ -311,7 +311,8 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory> ...@@ -311,7 +311,8 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
T* widget = createWidget<T>(params, parent); T* widget = createWidget<T>(params, parent);
createChildren(widget, node, typename T::child_registry_t::instance(), output_node); typedef typename T::child_registry_t registry_t;
createChildren(widget, node, registry_t::instance(), output_node);
if (widget && !widget->postBuild()) if (widget && !widget->postBuild())
{ {
......
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