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/llnotifications.h | |
| parent | 6fe4815217a11a36aa2e2b1d8b040eff007bb631 (diff) | |
| parent | 09e179b2381a4db03309839babae664feb9b0886 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llnotifications.h')
| -rw-r--r-- | indra/llui/llnotifications.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 0c4d4fc897..462d69be2e 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -201,7 +201,7 @@ public: FormInput(); }; - struct FormElement : public LLInitParam::Choice<FormElement> + struct FormElement : public LLInitParam::ChoiceBlock<FormElement> { Alternative<FormButton> button; Alternative<FormInput> input; @@ -312,7 +312,7 @@ public: Optional<LLNotificationContext*> context; Optional<void*> responder; - struct Functor : public LLInitParam::Choice<Functor> + struct Functor : public LLInitParam::ChoiceBlock<Functor> { Alternative<std::string> name; Alternative<LLNotificationFunctorRegistry::ResponseFunctor> function; |