From 85e142b949c83c674d316493ddaed71661e73066 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 16 Nov 2009 12:23:39 -0500
Subject: [PATCH] Header file cleanup

Removed unnecessary headers from llagent.cpp.  Alphabetized headers in llagent.h and llagent.cpp.
Trivial whitespace addition to llcallingcard.h

--HG--
branch : avatar-pipeline
---
 indra/newview/llagent.cpp     | 56 ++++++++---------------------------
 indra/newview/llagent.h       |  9 +++---
 indra/newview/llcallingcard.h |  1 +
 3 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ca1688ad1f7..a093c1d4342 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -31,83 +31,53 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llagent.h" 
-#include "llagentwearables.h"
+
+#include "pipeline.h"
 
 #include "llagentlistener.h"
+#include "llagentwearables.h"
+#include "llagentui.h"
+
 #include "llanimationstates.h"
+#include "llbottomtray.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
-#include "lldrawable.h"
 #include "llfirstuse.h"
-#include "llfloaterreg.h"
-#include "llspeakers.h"
 #include "llfloatercamera.h"
 #include "llfloatercustomize.h"
-
-#include "llfloaterland.h"
-#include "llfloatersnapshot.h"
+#include "llfloaterreg.h"
 #include "llfloatertools.h"
-#include "llfloaterworldmap.h"
-
 #include "llgroupactions.h"
-
-#include "llfocusmgr.h"
 #include "llgroupmgr.h"
 #include "llhomelocationresponder.h"
-#include "llimview.h"
 #include "llhudmanager.h"
 #include "lljoystickbutton.h"
-#include "llmenugl.h"
 #include "llmorphview.h"
 #include "llmoveview.h"
+#include "llnavigationbar.h" // to show/hide navigation bar when changing mouse look state
+#include "llnearbychatbar.h"
 #include "llparcel.h"
-#include "llquantize.h"
-#include "llrand.h"
-#include "llregionhandle.h"
 #include "llsdutil.h"
-#include "llselectmgr.h"
+#include "llsidetray.h"
 #include "llsky.h"
-#include "llslurl.h"
 #include "llsmoothstep.h"
-#include "llsidetray.h"
 #include "llstatusbar.h"
-#include "llteleportflags.h"
-#include "llteleporthistory.h"
-#include "lltexturestats.h"
-#include "lltexturestats.h"
 #include "lltool.h"
-#include "lltoolcomp.h"
 #include "lltoolmgr.h"
-#include "lluictrlfactory.h"
-#include "llurldispatcher.h"
-
-#include "llviewercamera.h"
+#include "lltrans.h"
+#include "llviewercontrol.h"
 #include "llviewerdisplay.h"
+#include "llviewerjoystick.h"
 #include "llviewermediafocus.h"
 #include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerstats.h"
-#include "llviewerwindow.h"
-#include "llviewercontrol.h"
-#include "llviewerjoystick.h"
-
 #include "llvoavatarself.h"
 #include "llwindow.h"
 #include "llworld.h"
 #include "llworldmap.h"
 
-#include "pipeline.h"
-#include "lltrans.h"
-#include "llbottomtray.h"
-#include "llnearbychatbar.h"
-#include "stringize.h"
-#include "llcapabilitylistener.h"
-
-#include "llnavigationbar.h" //to show/hide navigation bar when changing mouse look state
-#include "llagentui.h"
-
 using namespace LLVOAvatarDefines;
 
 extern LLMenuBarGL* gMenuBarView;
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 99a9bdd8e63..4162dfce1e5 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -36,14 +36,13 @@
 #include "indra_constants.h"
 #include "llevent.h" 				// LLObservable base class
 #include "llagentaccess.h"
-#include "llagentaccess.h"
 #include "llagentconstants.h"
-#include "llhudeffectpointat.h" 	// ELookAtType
-#include "llhudeffectlookat.h" 		// EPointAtType
-#include "llpointer.h"
+#include "llagentdata.h" 			// gAgentID, gAgentSessionID
 #include "llcharacter.h" 			// LLAnimPauseRequest
 #include "llfollowcam.h" 			// Ventrella
-#include "llagentdata.h" 			// gAgentID, gAgentSessionID
+#include "llhudeffectlookat.h" 		// EPointAtType
+#include "llhudeffectpointat.h" 	// ELookAtType
+#include "llpointer.h"
 #include "lluicolor.h"
 #include "llvoavatardefines.h"
 
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h
index bd58b2fbe61..47b0dcb9039 100644
--- a/indra/newview/llcallingcard.h
+++ b/indra/newview/llcallingcard.h
@@ -45,6 +45,7 @@
 //class LLInventoryObserver;
 class LLMessageSystem;
 class LLTrackingData;
+
 class LLFriendObserver
 {
 public:
-- 
GitLab