summaryrefslogtreecommitdiff
path: root/indra/llui/llnotificationtemplate.h
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2014-05-17 04:21:56 +0100
committerCho <cho@lindenlab.com>2014-05-17 04:21:56 +0100
commit43d12faffebe327b32724abbb5612e0351a18976 (patch)
tree9dc284c6dc6a5c518edb64c032b59c018ee307e7 /indra/llui/llnotificationtemplate.h
parent9a7458f9e32773c07b689a6d490e5bfe9c6ec47f (diff)
Added COMBINE_WITH_NEW for notifications for ACME-1471
Diffstat (limited to 'indra/llui/llnotificationtemplate.h')
-rwxr-xr-xindra/llui/llnotificationtemplate.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
index 0315ddbea8..c23fc53763 100755
--- a/indra/llui/llnotificationtemplate.h
+++ b/indra/llui/llnotificationtemplate.h
@@ -43,6 +43,7 @@ struct LLNotificationTemplate
static void declareValues()
{
declare("replace_with_new", LLNotification::REPLACE_WITH_NEW);
+ declare("combine_with_new", LLNotification::COMBINE_WITH_NEW);
declare("keep_old", LLNotification::KEEP_OLD);
declare("cancel_old", LLNotification::CANCEL_OLD);
}