summaryrefslogtreecommitdiff
path: root/indra/llui/llradiogroup.h
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-12-21 10:33:58 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2010-12-21 10:33:58 -0800
commite1b198a36b051051941c61d0a558766591ed4cfc (patch)
tree1809bf28779ab1f9b0cd05c97f94af3b7dfa5532 /indra/llui/llradiogroup.h
parentfdd5348f81d51363a1639de8b3cc4414fc0f4982 (diff)
parent9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff)
Merge from trunk
Diffstat (limited to 'indra/llui/llradiogroup.h')
-rw-r--r--indra/llui/llradiogroup.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index 0588900600..8bd5698538 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -49,7 +49,7 @@ public:
struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
{
- Optional<bool> has_border;
+ Optional<bool> allow_deselect;
Multiple<ItemParams, AtLeast<1> > items;
Params();
};
@@ -73,7 +73,6 @@ public:
void setIndexEnabled(S32 index, BOOL enabled);
// return the index value of the selected item
S32 getSelectedIndex() const { return mSelectedIndex; }
-
// set the index value programatically
BOOL setSelectedIndex(S32 index, BOOL from_event = FALSE);
@@ -103,12 +102,13 @@ public:
/*virtual*/ BOOL operateOnAll(EOperation op);
private:
- const LLFontGL* mFont;
- S32 mSelectedIndex;
+ const LLFontGL* mFont;
+ S32 mSelectedIndex;
+
typedef std::vector<class LLRadioCtrl*> button_list_t;
- button_list_t mRadioButtons;
+ button_list_t mRadioButtons;
- BOOL mHasBorder;
+ bool mAllowDeselect; // user can click on an already selected option to deselect it
};
#endif