From be50a053ed4ae7d0b15fc20f1c6ca0973c56ffd9 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Thu, 12 Aug 2010 09:46:45 -0700
Subject: first pass at hints

---
 indra/newview/llnotificationhandler.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/llnotificationhandler.h')

diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 99a1fedcf3..7b8f530178 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -269,6 +269,20 @@ protected:
 	void onRejectToast(LLUUID& id);
 };
 
+/**
+ * Handler for UI hints.
+ */
+class LLHintHandler : public LLSingleton<LLHintHandler>
+{
+public:
+	LLHintHandler();
+	virtual ~LLHintHandler();
+
+	// base interface functions
+	virtual bool processNotification(const LLSD& notify);
+};
+
+
 class LLHandlerUtil
 {
 public:
-- 
cgit v1.2.3


From 387011a1ff519d0e339b446ff5d02f0d009b7e5d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 00:45:27 -0700
Subject: EXP-29 WIP Implement popup blocking added web popup notification
 overlay

---
 indra/newview/llnotificationhandler.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/llnotificationhandler.h')

diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 3c84a02b68..28a69f2373 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -276,6 +276,15 @@ public:
 	virtual bool processNotification(const LLSD& notify);
 };
 
+/**
+ * Handler for browser notifications
+ */
+class LLBrowserNotification : public LLSingleton<LLBrowserNotification>
+{
+public:
+	virtual bool processNotification(const LLSD& notify);
+	
+};
 
 class LLHandlerUtil
 {
-- 
cgit v1.2.3


From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 22:10:30 -0700
Subject: fixed merge

---
 indra/newview/llnotificationhandler.h | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'indra/newview/llnotificationhandler.h')

diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index 28a69f2373..f20ddd20d5 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -27,19 +27,17 @@
 #ifndef LL_LLNOTIFICATIONHANDLER_H
 #define LL_LLNOTIFICATIONHANDLER_H
 
-
-#include "llwindow.h"
-
-//#include "llnotificationsutil.h"
-#include "llchannelmanager.h"
-#include "llchat.h"
-#include "llinstantmessage.h"
-#include "llnotificationptr.h"
-
 class LLIMFloater;
+class LLChat;
+
+typedef boost::shared_ptr<class LLNotification> LLNotificationPtr;
+enum EInstantMessage;
+typedef enum e_chat_source_type EChatSourceType;
 
 namespace LLNotificationsUI
 {
+	class LLToast;
+
 // ENotificationType enumerates all possible types of notifications that could be met
 // 
 typedef enum e_notification_type
@@ -103,7 +101,7 @@ protected:
 	// at the moment, when a handlers creates a channel.
 	virtual void initChannel()=0;
 
-	LLScreenChannelBase*	mChannel;
+	class LLScreenChannelBase*	mChannel;
 	e_notification_type		mType;
 
 };
-- 
cgit v1.2.3


From 949b60465593764118c03d0f4e112f69c41bab31 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 17 Sep 2010 15:01:44 -0700
Subject: Backed out changeset: d71309f8bd0e

---
 indra/newview/llnotificationhandler.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'indra/newview/llnotificationhandler.h')

diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h
index f20ddd20d5..28a69f2373 100644
--- a/indra/newview/llnotificationhandler.h
+++ b/indra/newview/llnotificationhandler.h
@@ -27,17 +27,19 @@
 #ifndef LL_LLNOTIFICATIONHANDLER_H
 #define LL_LLNOTIFICATIONHANDLER_H
 
-class LLIMFloater;
-class LLChat;
 
-typedef boost::shared_ptr<class LLNotification> LLNotificationPtr;
-enum EInstantMessage;
-typedef enum e_chat_source_type EChatSourceType;
+#include "llwindow.h"
+
+//#include "llnotificationsutil.h"
+#include "llchannelmanager.h"
+#include "llchat.h"
+#include "llinstantmessage.h"
+#include "llnotificationptr.h"
+
+class LLIMFloater;
 
 namespace LLNotificationsUI
 {
-	class LLToast;
-
 // ENotificationType enumerates all possible types of notifications that could be met
 // 
 typedef enum e_notification_type
@@ -101,7 +103,7 @@ protected:
 	// at the moment, when a handlers creates a channel.
 	virtual void initChannel()=0;
 
-	class LLScreenChannelBase*	mChannel;
+	LLScreenChannelBase*	mChannel;
 	e_notification_type		mType;
 
 };
-- 
cgit v1.2.3