diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:06:34 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:06:34 -0700 |
| commit | 0d5727814b5038b9deb3a635b9b0bd1e048763a3 (patch) | |
| tree | 6c6d301c260c00457690c57e6b0dfac05c497622 /indra/llui/llnotifications.h | |
| parent | 0481494c2df074d2b548d6b80e595a208a2848c3 (diff) | |
| parent | 998bdf10cc738ee9799d985af80bbb8c51ef2054 (diff) | |
Merge
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 b0e8553a49..0bd7e934ea 100755 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -413,6 +413,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); @@ -559,6 +562,7 @@ public: typedef enum e_combine_behavior { REPLACE_WITH_NEW, + COMBINE_WITH_NEW, KEEP_OLD, CANCEL_OLD |