diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-02 16:26:17 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-02 16:26:17 +0300 |
| commit | 8e2ec992d0bc937f72f6a1e96592f32798daac29 (patch) | |
| tree | b106227140e23c7ff66e7ac15c85877394a0b580 /indra/llui/llnotifications.h | |
| parent | 79f1e2178828a3e7c1738d8e0682d795aeb240bf (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge downstream code and become version 3.8.1
Diffstat (limited to 'indra/llui/llnotifications.h')
| -rwxr-xr-x | indra/llui/llnotifications.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 3cf432f330..0d673d178b 100755 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -414,6 +414,9 @@ private: using the same mechanism. */ bool mTemporaryResponder; + + // keep track of other notifications combined with COMBINE_WITH_NEW + std::vector<LLNotificationPtr> mCombinedNotifications; void init(const std::string& template_name, const LLSD& form_elements); @@ -560,6 +563,7 @@ public: typedef enum e_combine_behavior { REPLACE_WITH_NEW, + COMBINE_WITH_NEW, KEEP_OLD, CANCEL_OLD |