fixed merge

indra/llui/lllayoutstack.cpp

@@ -208,8 +208,8 @@ S32 LLLayoutStack::getDefaultWidth(S32 cur_width)
 
 void LLLayoutStack::movePanel(LLPanel* panel_to_move, LLPanel* target_panel, bool move_to_front)
 {
-	LayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move);
-	LayoutPanel* embedded_target_panel = move_to_front ? *mPanels.begin() : findEmbeddedPanel(target_panel);
+	LLLayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move);
+	LLLayoutPanel* embedded_target_panel = move_to_front ? *mPanels.begin() : findEmbeddedPanel(target_panel);
 
 	if (!embedded_panel_to_move || !embedded_target_panel || embedded_panel_to_move == embedded_target_panel)
 	{

indra/newview/llagentui.h

@@ -26,7 +26,6 @@
 
 #ifndef LLAGENTUI_H
 #define LLAGENTUI_H
-
 class LLSLURL;
 
 class LLAgentUI

indra/newview/llappviewer.cpp

@@ -46,6 +46,7 @@
 #include "llmd5.h"
 #include "llpumpio.h"
 #include "llmimetypes.h"
+#include "llmodaldialog.h"
 #include "llslurl.h"
 #include "llstartup.h"
 #include "llfocusmgr.h"

indra/newview/llbottomtray.h

@@ -29,6 +29,7 @@
 
 #include "llpanel.h"
 #include "llimview.h"
+#include "llbutton.h"
 
 class LLChicletPanel;
 class LLLayoutStack;

indra/newview/llbrowsernotification.cpp

@@ -28,9 +28,9 @@
 #include "llviewerprecompiledheaders.h" // must be first include
 
 #include "llnotificationhandler.h"
-#include "llnotifications.h"
-#include "llfloatermediabrowser.h"
-#include "llfloaterreg.h"
+//#include "llnotifications.h"
+//#include "llfloatermediabrowser.h"
+//#include "llfloaterreg.h"
 
 using namespace LLNotificationsUI;
 

indra/newview/llimhandler.cpp

@@ -28,6 +28,7 @@
 #include "llviewerprecompiledheaders.h" // must be first include
 
 #include "llnotificationhandler.h"
+#include "llchannelmanager.h"
 
 #include "llagentdata.h"
 #include "llnotifications.h"

indra/newview/llnearbychathandler.cpp

@@ -28,7 +28,7 @@
 
 #include "llagentdata.h" // for gAgentID
 #include "llnearbychathandler.h"
-
+#include "llchannelmanager.h"
 #include "llbottomtray.h"
 #include "llchatitemscontainerctrl.h"
 #include "llfirstuse.h"
@@ -36,6 +36,7 @@
 #include "llhints.h"
 #include "llnearbychat.h"
 #include "llrecentpeople.h"
+#include "llscreenchannel.h"
 
 #include "llviewercontrol.h"
 

indra/newview/llnotificationalerthandler.cpp

@@ -28,7 +28,7 @@
 #include "llviewerprecompiledheaders.h" // must be first include
 
 #include "llnotificationhandler.h"
-
+#include "llchannelmanager.h"
 #include "llnotifications.h"
 #include "llprogressview.h"
 #include "lltoastnotifypanel.h"

indra/newview/llnotificationgrouphandler.cpp

@@ -26,6 +26,7 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 
+#include "llchannelmanager.h"
 #include "llnotificationhandler.h"
 #include "lltoastgroupnotifypanel.h"
 #include "llgroupactions.h"

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

indra/newview/llnotificationhandlerutil.cpp

@@ -34,6 +34,7 @@
 #include "llfloaterreg.h"
 #include "llnearbychat.h"
 #include "llimfloater.h"
+#include "llscreenchannel.h"
 
 using namespace LLNotificationsUI;
 

indra/newview/llnotificationofferhandler.cpp

@@ -27,6 +27,7 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 
+#include "llchannelmanager.h"
 #include "llnotificationhandler.h"
 #include "lltoastnotifypanel.h"
 #include "llviewercontrol.h"

indra/newview/llnotificationscripthandler.cpp

@@ -27,6 +27,7 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 
+#include "llchannelmanager.h"
 #include "llnotificationhandler.h"
 #include "lltoastnotifypanel.h"
 #include "llviewercontrol.h"

indra/newview/llnotificationtiphandler.cpp

@@ -27,6 +27,8 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 
+#include "llchannelmanager.h"
+#include "llinstantmessage.h"
 #include "llfloaterreg.h"
 #include "llnearbychat.h"
 #include "llnotificationhandler.h"
@@ -36,6 +38,7 @@
 #include "llviewerwindow.h"
 #include "llnotificationmanager.h"
 #include "llpaneltiptoast.h"
+#include "lltoast.h"
 
 using namespace LLNotificationsUI;
 

indra/newview/llsyswellwindow.cpp

@@ -40,6 +40,7 @@
 #include "llviewerwindow.h"
 
 #include "llchiclet.h"
+#include "llchannelmanager.h"
 #include "lltoastpanel.h"
 #include "llnotificationmanager.h"
 #include "llnotificationsutil.h"

indra/newview/llviewermessage.cpp

@@ -49,6 +49,7 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llcallingcard.h"
+#include "llchannelmanager.h"
 #include "llbuycurrencyhtml.h"
 #include "llfirstuse.h"
 #include "llfloaterbuyland.h"
@@ -76,11 +77,13 @@
 #include "llstatenums.h"
 #include "llstatusbar.h"
 #include "llimview.h"
+#include "llscreenchannel.h"
 #include "llspeakers.h"
 #include "lltrans.h"
 #include "lltranslate.h"
 #include "llviewerfoldertype.h"
 #include "lluri.h"
+#include "llviewercontrol.h"
 #include "llviewergenericmessage.h"
 #include "llviewermenu.h"
 #include "llviewerjoystick.h"