diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
commit | 57040ea70e21ea5cfaedfd8a3506362a03562552 (patch) | |
tree | eb9dc090ab72bea2353de8a940ccdc7ab69d830e /indra/llui/llnotifications.h | |
parent | 8881b47d22a7cd17824e8162e0658af71bbe3dea (diff) | |
parent | d5877bc365292358eb4c9b8d14d1c8a1237ca5bd (diff) |
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
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 3b620084ee..6ac4a98806 100755 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -98,6 +98,8 @@ #include "llrefcount.h" #include "llsdparam.h" +#include "llnotificationslistener.h" + class LLAvatarName; typedef enum e_notification_priority { @@ -978,6 +980,8 @@ private: bool mIgnoreAllNotifications; + boost::scoped_ptr<LLNotificationsListener> mListener; + std::vector<LLNotificationChannelPtr> mDefaultChannels; }; |