summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-30 15:05:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-30 15:05:48 -0400
commit7a8c6a235e6f287b27303bd5733d4b7989ddd6c2 (patch)
treed7600105303cf1ffdf9068d444090916563f1e79
parentb15e34b94207c52d81e310f962e72f4d8030bd94 (diff)
EXT-6632 : INFRASTRUCTURE: LLAgentCamera / LLAgent header file / #include cleanup
Took out unnecessary #includes from llagentcamera.*
-rw-r--r--indra/newview/llagentcamera.cpp36
-rw-r--r--indra/newview/llagentcamera.h22
-rw-r--r--indra/newview/llpanelprimmediacontrols.cpp1
3 files changed, 7 insertions, 52 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 394c07b0f4..bb06255fd1 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -35,51 +35,25 @@
#include "pipeline.h"
-// SERAPH clean this up
-#include "llagentlistener.h"
-#include "llagentwearables.h"
-#include "llagentui.h"
+#include "llagent.h"
#include "llanimationstates.h"
-#include "llbottomtray.h"
-#include "llcallingcard.h"
-#include "llchannelmanager.h"
-#include "llconsole.h"
-//#include "llfirstuse.h"
#include "llfloatercamera.h"
#include "llfloatercustomize.h"
#include "llfloaterreg.h"
-#include "llfloatertools.h"
-#include "llgroupactions.h"
-#include "llgroupmgr.h"
-#include "llhomelocationresponder.h"
#include "llhudmanager.h"
#include "lljoystickbutton.h"
-#include "llmorphview.h"
-#include "llmoveview.h"
-#include "llnavigationbar.h" // to show/hide navigation bar when changing mouse look state
-#include "llnearbychatbar.h"
-#include "llnotificationsutil.h"
-#include "llparcel.h"
-#include "llsdutil.h"
-#include "llsidetray.h"
-#include "llsky.h"
+#include "llselectmgr.h"
#include "llsmoothstep.h"
-#include "llstatusbar.h"
-#include "llteleportflags.h"
-#include "lltool.h"
#include "lltoolmgr.h"
-#include "lltrans.h"
+#include "llviewercamera.h"
#include "llviewercontrol.h"
-#include "llviewerdisplay.h"
#include "llviewerjoystick.h"
-#include "llviewermediafocus.h"
#include "llviewerobjectlist.h"
-#include "llviewerparcelmgr.h"
-#include "llviewerstats.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
#include "llvoavatarself.h"
#include "llwindow.h"
#include "llworld.h"
-#include "llworldmap.h"
using namespace LLVOAvatarDefines;
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
index 9d226aeb81..56a0e68bd1 100644
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -33,32 +33,12 @@
#ifndef LL_LLAGENTCAMERA_H
#define LL_LLAGENTCAMERA_H
-#include "indra_constants.h"
-#include "llevent.h" // LLObservable base class
-#include "llagent.h"
-#include "llagentaccess.h"
-#include "llagentconstants.h"
-#include "llagentdata.h" // gAgentID, gAgentSessionID
-#include "llcharacter.h" // LLAnimPauseRequest
#include "llfollowcam.h" // Ventrella
#include "llhudeffectlookat.h" // EPointAtType
#include "llhudeffectpointat.h" // ELookAtType
-#include "llpointer.h"
-#include "lluicolor.h"
-#include "llvoavatardefines.h"
-class LLChat;
-class LLVOAvatarSelf;
-class LLViewerRegion;
-class LLMotion;
-class LLToolset;
-class LLMessageSystem;
-class LLPermissions;
-class LLHost;
-class LLFriendObserver;
class LLPickInfo;
-class LLViewerObject;
-class LLAgentDropGroupViewerNode;
+class LLVOAvatarSelf;
//--------------------------------------------------------------------
// Types
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index a9ec01f33a..ab2f9284f7 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -32,6 +32,7 @@
#include "llviewerprecompiledheaders.h"
//LLPanelPrimMediaControls
+#include "llagent.h"
#include "llagentcamera.h"
#include "llparcel.h"
#include "llpanel.h"