summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-07-29 16:04:21 -0400
committerOz Linden <oz@lindenlab.com>2013-07-29 16:04:21 -0400
commit9d63bb755f8ce8342fdd4be74193f64ad6e71736 (patch)
tree4e7ef6e96db3a883ad949d20f4a4ff5c626614c7 /indra/llui/llnotifications.h
parent91f7d0d1540ae448b45d8eceacff8aad2b88462a (diff)
parent499d132877974d076b852b4514b6320e111a5040 (diff)
merge changes for maint-2936
Diffstat (limited to 'indra/llui/llnotifications.h')
-rwxr-xr-xindra/llui/llnotifications.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 87573c2a56..9037712cc8 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
{
@@ -970,6 +972,8 @@ private:
bool mIgnoreAllNotifications;
+ boost::scoped_ptr<LLNotificationsListener> mListener;
+
std::vector<LLNotificationChannelPtr> mDefaultChannels;
};