From c3f2859c9f91d0c26c256b498c29da624afb8fb9 Mon Sep 17 00:00:00 2001 From: Mike Antipov <mantipov@productengine.com> Date: Sat, 26 Dec 2009 16:35:33 +0200 Subject: [PATCH] Reduced header dependency from the "llimview.h" --HG-- branch : product-engine --- indra/newview/llavatariconctrl.cpp | 1 - indra/newview/llcallingcard.cpp | 1 - indra/newview/llchannelmanager.cpp | 1 - indra/newview/llchathistory.cpp | 4 +++- indra/newview/llfloaterchatterbox.cpp | 1 + indra/newview/llfloaterchatterbox.h | 2 +- indra/newview/llfloaterreporter.cpp | 1 - indra/newview/llimpanel.cpp | 2 -- indra/newview/llimpanel.h | 1 - indra/newview/llparticipantlist.cpp | 1 - indra/newview/llparticipantlist.h | 1 - indra/newview/llstatusbar.cpp | 1 - indra/newview/llviewermenu.cpp | 1 + 13 files changed, 6 insertions(+), 12 deletions(-) diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index 44cbbbb6b2f..42ae122ff91 100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -38,7 +38,6 @@ #include "llavatarconstants.h" #include "llcallingcard.h" // for LLAvatarTracker #include "llavataractions.h" -#include "llimview.h" #include "llmenugl.h" #include "lluictrlfactory.h" diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 82413878adb..d988770f905 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -62,7 +62,6 @@ #include "llviewerobjectlist.h" #include "llviewerwindow.h" #include "llvoavatar.h" -#include "llimview.h" ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index cbb566b3a71..769387c26cb 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -36,7 +36,6 @@ #include "llappviewer.h" #include "llviewercontrol.h" -#include "llimview.h" #include "llviewerwindow.h" #include "llrootview.h" #include "llsyswellwindow.h" diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index b1ddddc4b1d..21cadda6e3e 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -31,12 +31,14 @@ */ #include "llviewerprecompiledheaders.h" + +#include "llinstantmessage.h" + #include "llchathistory.h" #include "llpanel.h" #include "lluictrlfactory.h" #include "llscrollcontainer.h" #include "llavatariconctrl.h" -#include "llimview.h" #include "llcallingcard.h" //for LLAvatarTracker #include "llagentdata.h" #include "llavataractions.h" diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp index 1b14ca573ab..9108cfb72bd 100644 --- a/indra/newview/llfloaterchatterbox.cpp +++ b/indra/newview/llfloaterchatterbox.cpp @@ -44,6 +44,7 @@ #include "llviewercontrol.h" #include "llvoicechannel.h" #include "llimpanel.h" +#include "llimview.h" // // LLFloaterMyFriends diff --git a/indra/newview/llfloaterchatterbox.h b/indra/newview/llfloaterchatterbox.h index 3929e6e36c6..ab44281d81d 100644 --- a/indra/newview/llfloaterchatterbox.h +++ b/indra/newview/llfloaterchatterbox.h @@ -36,8 +36,8 @@ #define LL_LLFLOATERCHATTERBOX_H #include "llfloater.h" +#include "llmultifloater.h" #include "llstring.h" -#include "llimview.h" #include "llimpanel.h" class LLTabContainer; diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 9f3dcae8ef6..c0825dc6948 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -57,7 +57,6 @@ #include "llfloaterreg.h" #include "lltexturectrl.h" #include "llscrolllistctrl.h" -#include "llimview.h" #include "lldispatcher.h" #include "llviewerobject.h" #include "llviewerregion.h" diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 8b6762ce380..4b45a9aba9e 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -57,13 +57,11 @@ #include "llfloateractivespeakers.h" #include "llfloatercall.h" #include "llavataractions.h" -#include "llimview.h" #include "llinventory.h" #include "llinventorymodel.h" #include "llfloaterinventory.h" #include "llfloaterchat.h" #include "lliconctrl.h" -#include "llimview.h" // for LLIMModel to get other avatar id in chat #include "llkeyboard.h" #include "lllineeditor.h" #include "llpanelimcontrolpanel.h" diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index b8f99d45c9d..abbf1e68abb 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -33,7 +33,6 @@ #ifndef LL_IMPANEL_H #define LL_IMPANEL_H -#include "llimview.h" //for LLIMModel #include "lldockablefloater.h" #include "lllogchat.h" #include "lluuid.h" diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 330e220af32..db4f9a2d95d 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -36,7 +36,6 @@ #include "lltrans.h" #include "llavataractions.h" #include "llagent.h" -#include "llimview.h" #include "llparticipantlist.h" #include "llspeakers.h" diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index d15ec980db0..70badbc40d2 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -33,7 +33,6 @@ #include "llviewerprecompiledheaders.h" #include "llevent.h" #include "llpanelpeoplemenus.h" -#include "llimview.h" #include "llavatarlist.h" // for LLAvatarItemRecentSpeakerComparator class LLSpeakerMgr; diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 23c4f00ab7a..2a6ef82ac04 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -50,7 +50,6 @@ #include "llkeyboard.h" #include "lllineeditor.h" #include "llmenugl.h" -#include "llimview.h" #include "llsd.h" #include "lltextbox.h" #include "llui.h" diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2a9c738c970..15855f154d6 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -70,6 +70,7 @@ #include "lltooltip.h" #include "llhudeffecttrail.h" #include "llhudmanager.h" +#include "llimview.h" #include "llinventorybridge.h" #include "llpanellogin.h" #include "llpanelblockedlist.h" -- GitLab