diff options
| author | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
| commit | 55c25229b79b1755c989e5996c8e8d118f369721 (patch) | |
| tree | 1fa882bc7e11dc8aec031d5e268131809874168a /indra/newview/llfloatersettingsdebug.cpp | |
| parent | b3fcfa16ba8b984163c38904e165052a34be6dab (diff) | |
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/newview/llfloatersettingsdebug.cpp')
| -rw-r--r-- | indra/newview/llfloatersettingsdebug.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index bb44304ae6..2b7d10a7a9 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -235,12 +235,16 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) spinner4->setVisible(FALSE); color_swatch->setVisible(FALSE); childSetVisible("val_text", FALSE); - childSetVisible("boolean_combo", FALSE); mComment->setText(LLString::null); if (controlp) { eControlType type = controlp->type(); + + //hide combo box only for non booleans, otherwise this will result in the combo box closing every frame + childSetVisible("boolean_combo", type == TYPE_BOOLEAN); + + mComment->setText(controlp->getComment()); spinner1->setMaxValue(F32_MAX); spinner2->setMaxValue(F32_MAX); @@ -304,8 +308,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) } break; case TYPE_BOOLEAN: - childSetVisible("boolean_combo", TRUE); - if (!childHasFocus("boolean_combo")) { if (sd.asBoolean()) |