diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-09 20:19:31 +0000 |
| commit | 8c344f4da02105428c5933501d028a4a8908a657 (patch) | |
| tree | 1463f67247c48a7420620917aa7fde5d6a810820 /indra/llui/llcheckboxctrl.cpp | |
| parent | 8534623734e64387736ddb76683939104d796ade (diff) | |
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
| -rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 3b054d2fec..fde27132e6 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -274,8 +274,6 @@ LLView* LLCheckBoxCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto LLString label(""); node->getAttributeString("label", label); - BOOL initial_value = FALSE; - LLFontGL* font = LLView::selectFont(node); BOOL radio_style = FALSE; @@ -297,9 +295,12 @@ LLView* LLCheckBoxCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto font, callback, NULL, - initial_value, + FALSE, radio_style); // if true, draw radio button style icons + BOOL initial_value = checkbox->getValue().asBoolean(); + node->getAttributeBOOL("initial_value", initial_value); + LLColor4 color; color = LLUI::sColorsGroup->getColor( "LabelTextColor" ); LLUICtrlFactory::getAttributeColor(node,"text_enabled_color", color); @@ -309,6 +310,8 @@ LLView* LLCheckBoxCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto LLUICtrlFactory::getAttributeColor(node,"text_disabled_color", color); checkbox->setDisabledColor(color); + checkbox->setValue(initial_value); + checkbox->initFromXML(node, parent); return checkbox; |