fixed merge

16 files changed, 30 insertions, 18 deletions

diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index a0275b6ed5..940c7e7e18 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/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)
 	{
diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
index afc0ba5d9a..be7d0c365a 100644
--- a/indra/newview/llagentui.h
+++ b/indra/newview/llagentui.h
@@ -26,7 +26,6 @@
 
 #ifndef LLAGENTUI_H
 #define LLAGENTUI_H
-
 class LLSLURL;
 
 class LLAgentUI
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 333c92e50d..3b374947a0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/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"
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 35e00924aa..6225d4c92c 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -29,6 +29,7 @@
 
 #include "llpanel.h"
 #include "llimview.h"
+#include "llbutton.h"
 
 class LLChicletPanel;
 class LLLayoutStack;
diff --git a/indra/newview/llbrowsernotification.cpp b/indra/newview/llbrowsernotification.cpp
index cc54d10944..8eb0bb1e0b 100644
--- a/indra/newview/llbrowsernotification.cpp
+++ b/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;
 
diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
index bc76092a20..e8c905a266 100644
--- a/indra/newview/llimhandler.cpp
+++ b/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"
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 303f2abcce..83777af31a 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/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"
 
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index dcbf6b64ce..6b9bd0436f 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/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"
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp
index 9933a8a49c..3819cb06e8 100644
--- a/indra/newview/llnotificationgrouphandler.cpp
+++ b/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"
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;
 
 };
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 4231a73af1..7c82ca0da9 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -34,6 +34,7 @@
 #include "llfloaterreg.h"
 #include "llnearbychat.h"
 #include "llimfloater.h"
+#include "llscreenchannel.h"
 
 using namespace LLNotificationsUI;
 
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index 85f95bd0c7..2c10aac06c 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/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"
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
index b4d28bb346..89b29756fb 100644
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/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"
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index 94612975a2..3c1cd107df 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/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;
 
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp
index 99342bb564..ca93027352 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/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"
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 48d11e1f05..317d08cc52 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/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"