diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-19 11:45:42 -0400 |
| commit | 4dd15ae27d1216044da57455eaa2a4832f86915f (patch) | |
| tree | 277056b7e3c98a3f4305c1a3553ee0ee18a8eb1c /indra/llui/llnotificationtemplate.h | |
| parent | d65d451448573f95b065a9be7c88ff239d5ed8be (diff) | |
| parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
merge
Diffstat (limited to 'indra/llui/llnotificationtemplate.h')
| -rw-r--r-- | indra/llui/llnotificationtemplate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h index ab777d37a5..fb50c9c123 100644 --- a/indra/llui/llnotificationtemplate.h +++ b/indra/llui/llnotificationtemplate.h @@ -91,7 +91,7 @@ struct LLNotificationTemplate // <notification> <unique/> </notification> // as well as // <notification> <unique> <context></context> </unique>... - Flag dummy_val; + Optional<LLInitParam::Flag> dummy_val; public: Multiple<UniquenessContext> contexts; @@ -147,7 +147,7 @@ struct LLNotificationTemplate {} }; - struct FormRef : public LLInitParam::Choice<FormRef> + struct FormRef : public LLInitParam::ChoiceBlock<FormRef> { Alternative<LLNotificationForm::Params> form; Alternative<TemplateRef> form_template; |