diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
| commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
| tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/llui/llnotificationtemplate.h | |
| parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
merge changes for 3.8.0-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); } |