diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:58:09 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:58:09 -0700 |
| commit | 0991a8a870b9cfee57a76f45f4f5ee1c5eb6d4cd (patch) | |
| tree | 2c503e2bec1398185e41875b3c357e5afb126c2b /indra/llui/lluictrl.h | |
| parent | 6fe4815217a11a36aa2e2b1d8b040eff007bb631 (diff) | |
| parent | 09e179b2381a4db03309839babae664feb9b0886 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lluictrl.h')
| -rw-r--r-- | indra/llui/lluictrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index fc56e5fc35..a8a4e3191d 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -76,14 +76,14 @@ public: Optional<enable_callback_t> function; }; - struct EnableControls : public LLInitParam::Choice<EnableControls> + struct EnableControls : public LLInitParam::ChoiceBlock<EnableControls> { Alternative<std::string> enabled; Alternative<std::string> disabled; EnableControls(); }; - struct ControlVisibility : public LLInitParam::Choice<ControlVisibility> + struct ControlVisibility : public LLInitParam::ChoiceBlock<ControlVisibility> { Alternative<std::string> visible; Alternative<std::string> invisible; |