diff options
| author | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
| commit | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (patch) | |
| tree | e24f1b1735f17968410704e56d0e043fb143aafe /indra/llui/llnotificationtemplate.h | |
| parent | f7908a50294adff3456436074075a677a9c6239b (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/llui/llnotificationtemplate.h')
| -rwxr-xr-x | indra/llui/llnotificationtemplate.h | 1 |
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); } |