Merge

1 files changed, 10 insertions, 8 deletions

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;
 
 };