diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-02 14:50:23 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-02 14:50:23 +0300 |
| commit | 2684c536906388da121ce2712a34d55aa786fa3f (patch) | |
| tree | 7d0baee83515e113e16819d6419b696670a7d046 /indra/llui/llnotificationtemplate.h | |
| parent | 1845816aa2419353ace258b7cfe24bdd08357ebe (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); } |