Skip to content
Snippets Groups Projects
Commit 0f5c7790 authored by Eli Linden's avatar Eli Linden
Browse files

Merge

parents c92dd096 19034f5c
No related branches found
No related tags found
No related merge requests found
......@@ -106,7 +106,6 @@ LLRadioGroup::LLRadioGroup(const LLRadioGroup::Params& p)
void LLRadioGroup::initFromParams(const Params& p)
{
LLUICtrl::initFromParams(p);
for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin();
it != p.items().end();
++it)
......@@ -124,6 +123,9 @@ void LLRadioGroup::initFromParams(const Params& p)
LLRadioCtrl* item = LLUICtrlFactory::create<LLRadioCtrl>(item_params, this);
mRadioButtons.push_back(item);
}
// call this *after* setting up mRadioButtons so we can handle setValue() calls
LLUICtrl::initFromParams(p);
}
......@@ -138,10 +140,6 @@ BOOL LLRadioGroup::postBuild()
{
mRadioButtons[0]->setTabStop(true);
}
if (mControlVariable)
{
setSelectedIndex(mControlVariable->getValue().asInteger());
}
return TRUE;
}
......
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