1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 4e8760947c..95f951b393 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -45,6 +45,7 @@
 #include "llgl.h"
 #include "lldrawable.h"
 #include "llrendertarget.h"
+#include "llmodel.h" //for LL_MESH_ENaBLED
 
 #include <stack>
 
@@ -61,7 +62,10 @@ class LLCullResult;
 class LLVOAvatar;
 class LLGLSLShader;
 class LLCurlRequest;
+
+#if LL_MESH_ENABLED
 class LLMeshResponder;
+#endif
 
 typedef enum e_avatar_skinning_method
 {
@@ -465,7 +469,9 @@ public:
 
 	S32						 mDebugTextureUploadCost;
 	S32						 mDebugSculptUploadCost;
+#if LL_MESH_ENABLED
 	S32						 mDebugMeshUploadCost;
+#endif
 
 	S32						 mLightingChanges;
 	S32						 mGeometryChanges;
@@ -712,13 +718,6 @@ public:
 protected:
 	std::vector<LLFace*>		mSelectedFaces;
 
-
-	typedef std::map<LLUUID, std::set<LLUUID> > mesh_load_map;
-	mesh_load_map mLoadingMeshes[4];
-	
-	typedef std::list<LLMeshResponder*> mesh_response_list;
-	mesh_response_list			mMeshResponseList;
-
 	LLPointer<LLViewerFetchedTexture>	mFaceSelectImagep;
 	
 	U32						mLightMask;