diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-01 08:47:50 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-01 08:47:50 -0700 |
| commit | 9f2302bdffde0c82a0cfab730a250aaee9b7059c (patch) | |
| tree | 942b1e99701fa70993515d706bdedc836157ef30 /indra/llui/llnotificationtemplate.h | |
| parent | f25179f148415763e310b0dd7f91a37dcf4c58c0 (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge
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); } |