summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/llui/lllayoutstack.cpp4
-rw-r--r--indra/newview/llagentui.h1
-rw-r--r--indra/newview/llappviewer.cpp1
-rw-r--r--indra/newview/llbottomtray.h1
-rw-r--r--indra/newview/llbrowsernotification.cpp6
-rw-r--r--indra/newview/llimhandler.cpp1
-rw-r--r--indra/newview/llnearbychathandler.cpp3
-rw-r--r--indra/newview/llnotificationalerthandler.cpp2
-rw-r--r--indra/newview/llnotificationgrouphandler.cpp1
-rw-r--r--indra/newview/llnotificationhandler.h18
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp1
-rw-r--r--indra/newview/llnotificationofferhandler.cpp1
-rw-r--r--indra/newview/llnotificationscripthandler.cpp1
-rw-r--r--indra/newview/llnotificationtiphandler.cpp3
-rw-r--r--indra/newview/llsyswellwindow.cpp1
-rw-r--r--indra/newview/llviewermessage.cpp3
16 files changed, 18 insertions, 30 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 940c7e7e18..a0275b6ed5 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)
{
- LLLayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move);
- LLLayoutPanel* embedded_target_panel = move_to_front ? *mPanels.begin() : findEmbeddedPanel(target_panel);
+ LayoutPanel* embedded_panel_to_move = findEmbeddedPanel(panel_to_move);
+ LayoutPanel* 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 be7d0c365a..afc0ba5d9a 100644
--- a/indra/newview/llagentui.h
+++ b/indra/newview/llagentui.h
@@ -26,6 +26,7 @@
#ifndef LLAGENTUI_H
#define LLAGENTUI_H
+
class LLSLURL;
class LLAgentUI
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3b374947a0..333c92e50d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -46,7 +46,6 @@
#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 6225d4c92c..35e00924aa 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -29,7 +29,6 @@
#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 8eb0bb1e0b..cc54d10944 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 e8c905a266..bc76092a20 100644
--- a/indra/newview/llimhandler.cpp
+++ b/indra/newview/llimhandler.cpp
@@ -28,7 +28,6 @@
#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 83777af31a..303f2abcce 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,7 +36,6 @@
#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 6b9bd0436f..dcbf6b64ce 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 3819cb06e8..9933a8a49c 100644
--- a/indra/newview/llnotificationgrouphandler.cpp
+++ b/indra/newview/llnotificationgrouphandler.cpp
@@ -26,7 +26,6 @@
#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 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;
};
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 7c82ca0da9..4231a73af1 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -34,7 +34,6 @@
#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 2c10aac06c..85f95bd0c7 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -27,7 +27,6 @@
#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 89b29756fb..b4d28bb346 100644
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/indra/newview/llnotificationscripthandler.cpp
@@ -27,7 +27,6 @@
#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 3c1cd107df..94612975a2 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -27,8 +27,6 @@
#include "llviewerprecompiledheaders.h" // must be first include
-#include "llchannelmanager.h"
-#include "llinstantmessage.h"
#include "llfloaterreg.h"
#include "llnearbychat.h"
#include "llnotificationhandler.h"
@@ -38,7 +36,6 @@
#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 ca93027352..99342bb564 100644
--- a/indra/newview/llsyswellwindow.cpp
+++ b/indra/newview/llsyswellwindow.cpp
@@ -40,7 +40,6 @@
#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 317d08cc52..48d11e1f05 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -49,7 +49,6 @@
#include "llagent.h"
#include "llagentcamera.h"
#include "llcallingcard.h"
-#include "llchannelmanager.h"
#include "llbuycurrencyhtml.h"
#include "llfirstuse.h"
#include "llfloaterbuyland.h"
@@ -77,13 +76,11 @@
#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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 07:02:37 +0000