From c6f698f617f48dcd0aea6e665e01aa617bb982fe Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 10 Apr 2010 13:39:26 -0700 Subject: Removed some duplicate includes I've come across --- linden/indra/newview/llchatbar.cpp | 1 - linden/indra/newview/llcompilequeue.cpp | 4 ---- linden/indra/newview/llconsole.cpp | 1 - linden/indra/newview/llfloaterbulkpermission.cpp | 2 -- linden/indra/newview/llmaniprotate.cpp | 1 - linden/indra/newview/lloverlaybar.cpp | 1 - linden/indra/newview/llviewerdisplay.cpp | 1 - linden/indra/newview/llviewerwindow.cpp | 1 - linden/indra/newview/llwaterparammanager.cpp | 1 - linden/indra/newview/primbackup.cpp | 7 ------- 10 files changed, 20 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 1146c44..8401138 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp @@ -67,7 +67,6 @@ #include "llinventorymodel.h" #include "llmultigesture.h" #include "llui.h" -#include "llviewermenu.h" #include "lluictrlfactory.h" diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp index 0f60ad5..ed18a10 100644 --- a/linden/indra/newview/llcompilequeue.cpp +++ b/linden/indra/newview/llcompilequeue.cpp @@ -52,8 +52,6 @@ #include "llviewerregion.h" #include "lscript_rt_interface.h" #include "llviewercontrol.h" -#include "llviewerobject.h" -#include "llviewerregion.h" #include "llresmgr.h" #include "llbutton.h" #include "lldir.h" @@ -62,8 +60,6 @@ #include "lluictrlfactory.h" #include "llselectmgr.h" -#include "llselectmgr.h" - ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp index 74943a5..2379da3 100644 --- a/linden/indra/newview/llconsole.cpp +++ b/linden/indra/newview/llconsole.cpp @@ -35,7 +35,6 @@ #include "llconsole.h" // linden library includes -#include "llmath.h" #include "llviewercontrol.h" #include "llcriticaldamp.h" #include "llfontgl.h" diff --git a/linden/indra/newview/llfloaterbulkpermission.cpp b/linden/indra/newview/llfloaterbulkpermission.cpp index 6721661..b5cf2d7 100644 --- a/linden/indra/newview/llfloaterbulkpermission.cpp +++ b/linden/indra/newview/llfloaterbulkpermission.cpp @@ -43,8 +43,6 @@ #include "llviewerregion.h" #include "lscript_rt_interface.h" #include "llviewercontrol.h" -#include "llviewerobject.h" -#include "llviewerregion.h" #include "llresmgr.h" #include "llbutton.h" #include "lldir.h" diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp index 8b0484b..ad7399e 100644 --- a/linden/indra/newview/llmaniprotate.cpp +++ b/linden/indra/newview/llmaniprotate.cpp @@ -57,7 +57,6 @@ #include "llvoavatar.h" #include "llviewercamera.h" #include "llviewerobject.h" -#include "llviewerobject.h" #include "llviewerwindow.h" #include "llworld.h" #include "pipeline.h" diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp index 599d736..9f3776f 100644 --- a/linden/indra/newview/lloverlaybar.cpp +++ b/linden/indra/newview/lloverlaybar.cpp @@ -55,7 +55,6 @@ #include "llviewerjoystick.h" #include "llviewermedia.h" #include "llviewermenu.h" // handle_reset_view() -#include "llviewermedia.h" #include "llviewerparcelmedia.h" #include "llviewerparcelmgr.h" #include "lluictrlfactory.h" diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp index 6f7de25..097438b 100644 --- a/linden/indra/newview/llviewerdisplay.cpp +++ b/linden/indra/newview/llviewerdisplay.cpp @@ -69,7 +69,6 @@ #include "pipeline.h" #include "llspatialpartition.h" #include "llappviewer.h" -#include "llstartup.h" #include "llviewershadermgr.h" #include "llfasttimer.h" #include "llfloatertools.h" diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 3d884ad..36f1a70 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp @@ -70,7 +70,6 @@ #include "object_flags.h" #include "lltimer.h" #include "timing.h" -#include "llviewermenu.h" // newview includes #include "llagent.h" diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp index 50e4077..67fd977 100644 --- a/linden/indra/newview/llwaterparammanager.cpp +++ b/linden/indra/newview/llwaterparammanager.cpp @@ -43,7 +43,6 @@ #include "llspinctrl.h" #include "llcheckboxctrl.h" #include "lluictrlfactory.h" -#include "llviewercontrol.h" #include "llviewercamera.h" #include "llcombobox.h" #include "lllineeditor.h" diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp index a9a8af7..3ab5ee1 100644 --- a/linden/indra/newview/primbackup.cpp +++ b/linden/indra/newview/primbackup.cpp @@ -1,6 +1,5 @@ #include "llviewerprecompiledheaders.h" -#include "llviewermenu.h" // system library includes @@ -29,7 +28,6 @@ #include "lldir.h" #include "llimage.h" #include "lllfsthread.h" -#include "llviewercontrol.h" #include "llassetuploadresponders.h" #include "lleconomy.h" #include "llhttpclient.h" @@ -38,24 +36,19 @@ #include "llinventorymodel.h" // gInventory #include "llviewercontrol.h" // gSavedSettings #include "llviewermenu.h" // gMenuHolder -#include "llagent.h" #include "llfilepicker.h" #include "llfloateranimpreview.h" #include "llfloaterbuycurrency.h" #include "llfloaterimagepreview.h" #include "llfloaternamedesc.h" #include "llfloatersnapshot.h" -#include "llinventorymodel.h" // gInventory #include "llresourcedata.h" #include "llstatusbar.h" -#include "llviewercontrol.h" // gSavedSettings #include "llviewerimagelist.h" #include "lluictrlfactory.h" -#include "llviewermenu.h" // gMenuHolder #include "llviewerregion.h" #include "llviewerstats.h" #include "llviewerwindow.h" -#include "llappviewer.h" #include "lluploaddialog.h" // Included to allow LLTextureCache::purgeTextures() to pause watchdog timeout #include "llappviewer.h" -- cgit v1.1