diff options
| author | andreykproductengine <none@none> | 2015-07-03 15:20:39 +0300 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2015-07-03 15:20:39 +0300 |
| commit | cff5f2a92412dd094e335a17b7957b0270600371 (patch) | |
| tree | fa40ea8ef119e8f6564cf2d1b751107556db180d /indra/llui/llnotificationtemplate.h | |
| parent | c148c1d6d904785db0b8df09038be0184faa0317 (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge from viewer-relese and become version 3.8.1
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); } |