summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-06-23 21:59:31 +0000
committerJames Cook <james@lindenlab.com>2009-06-23 21:59:31 +0000
commitfe487f46e37f0db1e8cee7a3e52020e06a79d196 (patch)
tree51b8e73ff893da4b47db768631d7e4f0b4a80b2d
parentfcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff)
Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed.
-rw-r--r--indra/newview/llagent.cpp4
-rw-r--r--indra/newview/llappviewer.h11
-rw-r--r--indra/newview/llassetuploadresponders.cpp2
-rw-r--r--indra/newview/llavatariconctrl.cpp2
-rw-r--r--indra/newview/llavatarpropertiesprocessor.h2
-rw-r--r--indra/newview/llcapabilitylistener.cpp1
-rw-r--r--indra/newview/llcapabilitylistener.h1
-rw-r--r--indra/newview/llcaphttpsender.cpp3
-rw-r--r--indra/newview/llcloud.cpp1
-rw-r--r--indra/newview/llcompilequeue.cpp2
-rw-r--r--indra/newview/lldynamictexture.h1
-rw-r--r--indra/newview/lleventpoll.h3
-rw-r--r--indra/newview/llfeaturemanager.h1
-rw-r--r--indra/newview/llhudeffectpointat.h1
-rw-r--r--indra/newview/llimview.h1
-rw-r--r--indra/newview/llinventorymodel.h4
-rw-r--r--indra/newview/llviewercamera.h3
-rw-r--r--indra/newview/llviewermessage.h4
-rw-r--r--indra/newview/llviewerobject.h1
-rw-r--r--indra/newview/llviewerobjectlist.h2
-rw-r--r--indra/newview/llviewerregion.h1
-rw-r--r--indra/newview/llvoavatar.h2
-rw-r--r--indra/newview/llvoiceclient.h1
-rw-r--r--indra/newview/llvovolume.h4
-rw-r--r--indra/newview/pipeline.h1
25 files changed, 52 insertions, 7 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index a70d31431f..a8094a5850 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -64,6 +64,9 @@
#include "llmorphview.h"
#include "llmoveview.h"
#include "llparcel.h"
+#include "llquantize.h"
+#include "llrand.h"
+#include "llregionhandle.h"
#include "llsdutil.h"
#include "llselectmgr.h"
#include "llsky.h"
@@ -71,6 +74,7 @@
#include "llsmoothstep.h"
#include "llsidetray.h"
#include "llstatusbar.h"
+#include "llteleportflags.h"
#include "llteleporthistory.h"
#include "lltool.h"
#include "lltoolcomp.h"
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 75033698b6..3e3b523169 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -33,14 +33,19 @@
#ifndef LL_LLAPPVIEWER_H
#define LL_LLAPPVIEWER_H
+#include "llallocator.h"
#include "llcontrol.h"
+#include "llsys.h" // for LLOSInfo
+class LLCommandLineParser;
+class LLFrameTimer;
+class LLPumpIO;
class LLTextureCache;
-class LLWorkerThread;
class LLTextureFetch;
+class LLTimer;
+class LLVFS;
class LLWatchdogTimeout;
-class LLCommandLineParser;
-class LLAllocator;
+class LLWorkerThread;
class LLAppViewer : public LLApp
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 4cd9647603..1379073bba 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -58,11 +58,13 @@
#include "lltexlayer.h"
// library includes
+#include "lldir.h"
#include "lleconomy.h"
#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llscrolllistctrl.h"
#include "llsdserialize.h"
+#include "llvfs.h"
// When uploading multiple files, don't display any of them when uploading more than this number.
static const S32 FILE_COUNT_DISPLAY_THRESHOLD = 5;
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 807f2f035c..3cd6126739 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -41,6 +41,8 @@
#include "llmenugl.h"
#include "lluictrlfactory.h"
+#include "llcachename.h"
+
#define MENU_ITEM_VIEW_PROFILE 0
#define MENU_ITEM_SEND_IM 1
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index 4d50541d9a..2e10dea834 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -34,6 +34,8 @@
#define LL_LLAVATARPROPERTIESPROCESSOR_H
#include "lluuid.h"
+#include "llsingleton.h"
+#include "v3dmath.h" // LLVector3d
#include <map>
/*
diff --git a/indra/newview/llcapabilitylistener.cpp b/indra/newview/llcapabilitylistener.cpp
index 3277da8930..4134e9e0a4 100644
--- a/indra/newview/llcapabilitylistener.cpp
+++ b/indra/newview/llcapabilitylistener.cpp
@@ -21,6 +21,7 @@
// other Linden headers
#include "stringize.h"
#include "llcapabilityprovider.h"
+#include "message.h"
class LLCapabilityListener::CapabilityMappers: public LLSingleton<LLCapabilityListener::CapabilityMappers>
{
diff --git a/indra/newview/llcapabilitylistener.h b/indra/newview/llcapabilitylistener.h
index 061227e04d..ce16b7da5d 100644
--- a/indra/newview/llcapabilitylistener.h
+++ b/indra/newview/llcapabilitylistener.h
@@ -17,6 +17,7 @@
#include "llerror.h" // LOG_CLASS()
class LLCapabilityProvider;
+class LLMessageSystem;
class LLSD;
class LLCapabilityListener
diff --git a/indra/newview/llcaphttpsender.cpp b/indra/newview/llcaphttpsender.cpp
index 1127f43424..b44e1f11fa 100644
--- a/indra/newview/llcaphttpsender.cpp
+++ b/indra/newview/llcaphttpsender.cpp
@@ -32,9 +32,10 @@
#include "llviewerprecompiledheaders.h"
-#include "linden_common.h"
#include "llcaphttpsender.h"
+#include "llhost.h"
+
LLCapHTTPSender::LLCapHTTPSender(const std::string& cap) :
mCap(cap)
{
diff --git a/indra/newview/llcloud.cpp b/indra/newview/llcloud.cpp
index 0099817de4..af6f4e3286 100644
--- a/indra/newview/llcloud.cpp
+++ b/indra/newview/llcloud.cpp
@@ -37,6 +37,7 @@
#include "v3math.h"
#include "v4math.h"
#include "llquaternion.h"
+#include "llrand.h"
#include "v4color.h"
#include "llwind.h"
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 096777ddd4..9d3b92d937 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -56,10 +56,12 @@
#include "llviewerobject.h"
#include "llviewerregion.h"
#include "llresmgr.h"
+
#include "llbutton.h"
#include "lldir.h"
#include "llfloaterchat.h"
#include "llviewerstats.h"
+#include "llvfile.h"
#include "lluictrlfactory.h"
#include "lltrans.h"
diff --git a/indra/newview/lldynamictexture.h b/indra/newview/lldynamictexture.h
index 5a20eaef9b..22e5a4819d 100644
--- a/indra/newview/lldynamictexture.h
+++ b/indra/newview/lldynamictexture.h
@@ -33,6 +33,7 @@
#ifndef LL_LLDYNAMICTEXTURE_H
#define LL_LLDYNAMICTEXTURE_H
+#include "llcamera.h"
#include "llgl.h"
#include "llcoord.h"
#include "llimagegl.h"
diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index 12e4b49d57..f2465a361e 100644
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -35,6 +35,9 @@
#include "llhttpclient.h"
+class LLHost;
+
+
class LLEventPoll
///< implements the viewer side of server-to-viewer pushed events.
{
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 537bf0c6a4..383963a41d 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -35,6 +35,7 @@
#include "stdtypes.h"
+#include "llsingleton.h"
#include "llstring.h"
#include <map>
diff --git a/indra/newview/llhudeffectpointat.h b/indra/newview/llhudeffectpointat.h
index 81db3da1c7..278c69fe2b 100644
--- a/indra/newview/llhudeffectpointat.h
+++ b/indra/newview/llhudeffectpointat.h
@@ -33,6 +33,7 @@
#ifndef LL_LLHUDEFFECTPOINTAT_H
#define LL_LLHUDEFFECTPOINTAT_H
+#include "llframetimer.h"
#include "llhudeffect.h"
class LLViewerObject;
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 469f6ec21d..37dcd1593f 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -33,6 +33,7 @@
#ifndef LL_LLIMVIEW_H
#define LL_LLIMVIEW_H
+#include "lldarray.h"
#include "llmodaldialog.h"
#include "llinstantmessage.h"
#include "lluuid.h"
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 2193552f4a..77e604769e 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -35,6 +35,8 @@
#include "llassettype.h"
#include "lldarray.h"
+#include "llframetimer.h"
+#include "llhttpclient.h"
#include "lluuid.h"
#include "llpermissionsflags.h"
#include "llstring.h"
@@ -111,7 +113,7 @@ public:
LLInventoryModel();
~LLInventoryModel();
- class fetchInventoryResponder: public LLHTTPClient::Responder
+ class fetchInventoryResponder : public LLHTTPClient::Responder
{
public:
fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
index 9615d00200..b99dd39584 100644
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -34,8 +34,9 @@
#define LL_LLVIEWERCAMERA_H
#include "llcamera.h"
-#include "lltimer.h"
+#include "llsingleton.h"
#include "llstat.h"
+#include "lltimer.h"
#include "m4math.h"
class LLCoordGL;
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index 90a54e2b9c..c15e5df675 100644
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -34,6 +34,7 @@
#define LL_LLVIEWERMESSAGE_H
#include "llinstantmessage.h"
+#include "llpointer.h"
#include "lltransactiontypes.h"
#include "lluuid.h"
#include "stdenums.h"
@@ -42,10 +43,11 @@
// Forward declarations
//
class LLColor4;
-class LLViewerObject;
class LLInventoryObject;
class LLInventoryItem;
+class LLMeanCollisionData;
class LLMessageSystem;
+class LLViewerObject;
class LLViewerRegion;
//
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 21a99c58d9..72c713f2a6 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -64,6 +64,7 @@ class LLWorld;
class LLNameValue;
class LLNetMap;
class LLMessageSystem;
+class LLPartSysData;
class LLPrimitive;
class LLPipeline;
class LLTextureEntry;
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 0f906a4d7f..ace5c5038e 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -39,11 +39,13 @@
// common includes
#include "llstat.h"
#include "lldarrayptr.h"
+#include "llmap.h" // *TODO: switch to std::map
#include "llstring.h"
// project includes
#include "llviewerobject.h"
+class LLCamera;
class LLNetMap;
class LLDebugBeacon;
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 35f374a4c8..49d0900f2a 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -51,6 +51,7 @@
#include "llweb.h"
#include "llcapabilityprovider.h"
#include "llcapabilitylistener.h"
+#include "m4math.h" // LLMatrix4
// Surface id's
#define LAND 1
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 301c032b25..56a8e3cd11 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -39,6 +39,7 @@
#include <string>
#include <vector>
+#include "imageids.h" // IMG_INVISIBLE
#include "llchat.h"
#include "lldrawpoolalpha.h"
#include "llviewerobject.h"
@@ -49,6 +50,7 @@
#include "llvoavatardefines.h"
#include "lltexglobalcolor.h"
#include "lldriverparam.h"
+#include "material_codes.h" // LL_MCODE_END
extern const LLUUID ANIM_AGENT_BODY_NOISE;
extern const LLUUID ANIM_AGENT_BREATHE_ROT;
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 1066ac73f1..8b3bbb68bb 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -43,6 +43,7 @@ class LLVivoxProtocolParser;
#include "llframetimer.h"
#include "llviewerregion.h"
#include "llcallingcard.h" // for LLFriendObserver
+#include "m3math.h" // LLMatrix3
class LLVoiceClientParticipantObserver
{
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 155775510e..f20e551671 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -37,6 +37,8 @@
#include "llviewerimage.h"
#include "llframetimer.h"
#include "llapr.h"
+#include "m3math.h" // LLMatrix3
+#include "m4math.h" // LLMatrix4
#include <map>
class LLViewerTextureAnim;
@@ -158,12 +160,14 @@ public:
/*virtual*/ S32 setTEBumpmap(const U8 te, const U8 bump);
/*virtual*/ S32 setTEShiny(const U8 te, const U8 shiny);
/*virtual*/ S32 setTEFullbright(const U8 te, const U8 fullbright);
+ /*virtual*/ S32 setTEBumpShinyFullbright(const U8 te, const U8 bump);
/*virtual*/ S32 setTEMediaFlags(const U8 te, const U8 media_flags);
/*virtual*/ S32 setTEGlow(const U8 te, const F32 glow);
/*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t);
/*virtual*/ S32 setTEScaleS(const U8 te, const F32 s);
/*virtual*/ S32 setTEScaleT(const U8 te, const F32 t);
/*virtual*/ S32 setTETexGen(const U8 te, const U8 texgen);
+ /*virtual*/ S32 setTEMediaTexGen(const U8 te, const U8 media);
/*virtual*/ BOOL setMaterial(const U8 material);
void setTexture(const S32 face);
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index c017e9b64f..5358fce766 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -33,6 +33,7 @@
#ifndef LL_PIPELINE_H
#define LL_PIPELINE_H
+#include "llcamera.h"
#include "llerror.h"
#include "lldarrayptr.h"
#include "lldqueueptr.h"