diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
| commit | b5324afb6f2e45deefb9b79e7e2192bc686b181a (patch) | |
| tree | dcae0395e2975f736a90c1fa3c67d6f318e01cc7 /indra/llui/llnotifications.h | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
| parent | c7841b48bdec74848a64e2dd0eac453ce855093d (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 |