summaryrefslogtreecommitdiff
path: root/indra/llui/llnotificationtemplate.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-16 11:58:16 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-16 11:58:16 -0700
commit712d4585950230ebd5ba66b3c60982ebcf6ebce9 (patch)
treedfdc5af716d83250c0be5b34eaf01cd66c1b1dee /indra/llui/llnotificationtemplate.h
parent9e00dc0cc0af26d85d5613e8bddc03067e37c7d2 (diff)
parentc10832bb9ade5efa2a501cb3b39f769aa3024363 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llnotificationtemplate.h')
-rw-r--r--indra/llui/llnotificationtemplate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
index eff572b553..ab777d37a5 100644
--- a/indra/llui/llnotificationtemplate.h
+++ b/indra/llui/llnotificationtemplate.h
@@ -88,10 +88,10 @@ struct LLNotificationTemplate
{
private:
// this idiom allows
- // <notification unique="true">
+ // <notification> <unique/> </notification>
// as well as
// <notification> <unique> <context></context> </unique>...
- Optional<bool> dummy_val;
+ Flag dummy_val;
public:
Multiple<UniquenessContext> contexts;