diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
| commit | 950c41d184b340a7a3370c2cbda5d1eed9a17b0b (patch) | |
| tree | 373912394af6834d7d56258becf46954244b8423 /indra/llui/llradiogroup.cpp | |
| parent | 20198b750d02c769ab6845226f98ce6e5dd1f20b (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
merge 4.0.4-release and MAINT-5974
Diffstat (limited to 'indra/llui/llradiogroup.cpp')
| -rw-r--r-- | indra/llui/llradiogroup.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp index b53bb16d97..8cf72928ff 100644 --- a/indra/llui/llradiogroup.cpp +++ b/indra/llui/llradiogroup.cpp @@ -179,6 +179,18 @@ BOOL LLRadioGroup::setSelectedIndex(S32 index, BOOL from_event) return FALSE; } + if (index < -1) + { + // less then minimum value + return FALSE; + } + + if (index < 0 && mSelectedIndex >= 0 && !mAllowDeselect) + { + // -1 is "nothing selected" + return FALSE; + } + if (mSelectedIndex >= 0) { LLRadioCtrl* old_radio_item = mRadioButtons[mSelectedIndex]; |